From 15a858b73552f26782ee965ec91e2d4f87740de4 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Thu, 4 Nov 2021 13:21:47 +0100
Subject: [PATCH] CI: Move separate master job to the loop loop

---
 .github/workflows/build.yml | 60 ++++++++-----------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9c5830284..cfcb590a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,68 +3,34 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  build_idf_master:
-    name: build-with-IDF-master
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@master
-        with:
-          path: esp-protocols
-      - name: Checkout IDF
-        uses: actions/checkout@master
-        with:
-          repository:  espressif/esp-idf
-          path: esp-idf
-
-      - name: Build-examples-with-IDF
-        run: |
-          cd $GITHUB_WORKSPACE/esp-idf
-          git submodule update --init --recursive
-          ./install.sh
-          source export.sh
-          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/simple_cmux_client
-          idf.py build
-          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/ap_to_pppos
-          idf.py build
-          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/modem_console
-          idf.py build
-          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/pppos_client
-          idf.py build
-
   build:
     strategy:
       matrix:
-        idf_ver: ["v4.1", "v4.2", "v4.3", "v4.4"]
-        examples: ["pppos_client", "modem_console", "ap_to_pppos", "simple_cmux_client"]
+        idf_ver: ["latest", "release-v4.1", "release-v4.2", "release-v4.3", "release-v4.4"]
+        example: ["pppos_client", "modem_console", "ap_to_pppos", "simple_cmux_client"]
         idf_target: ["esp32"]        
         exclude:
-          - idf_ver: "v4.1"
-            examples: modem_console
-          - idf_ver: "v4.1"
-            examples: ap_to_pppos
-          - idf_ver: "v4.1"
-            examples: simple_cmux_client
-          - idf_ver: "v4.2"
-            examples: simple_cmux_client
+          - idf_ver: "release-v4.1"
+            example: modem_console
+          - idf_ver: "release-v4.1"
+            example: ap_to_pppos
+          - idf_ver: "release-v4.1"
+            example: simple_cmux_client
+          - idf_ver: "release-v4.2"
+            example: simple_cmux_client
 
     runs-on: ubuntu-20.04
-    container: espressif/idf:release-${{ matrix.idf_ver }}
+    container: espressif/idf:${{ matrix.idf_ver }}
     steps:
-      - name: Checkout IDF
-        uses: actions/checkout@v1
-        with:
-          submodules: recursive
       - name: Checkout esp-protocols
         uses: actions/checkout@master
         with:
           path: esp-protocols
-      - name: Build for ESP32
+      - name: Build ${{ matrix.example }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
         env:
           IDF_TARGET: ${{ matrix.idf_target }}
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/${{ matrix.examples }}
+          cd $GITHUB_WORKSPACE/esp-protocols/components/esp_modem/examples/${{ matrix.example }}
           idf.py build