separate build for hil

hathach · May 10, 2024 · 5e6c203 · 5e6c203
1 parent 21a73d4
commit 5e6c203
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 135 deletions.
diff --git a/.github/workflows/build_esp.yml b/.github/workflows/build_esp.yml
diff --git a/.github/workflows/ci_set_matrix.py b/.github/workflows/ci_set_matrix.py
@@ -16,7 +16,7 @@
     "ch32v307 fomu gd32vf103": ["riscv-gcc"],
     "imxrt": ["arm-gcc", "arm-clang"],
     "kinetis_k kinetis_kl kinetis_k32l2": ["arm-gcc", "arm-clang"],
-    "lpc11 lpc13 lpc15": ["arm-gcc"],
+    "lpc11 lpc13 lpc15": ["arm-gcc", "arm-clang"],
     "lpc17 lpc18 lpc40 lpc43": ["arm-gcc", "arm-clang"],
     "lpc51 lpc54 lpc55": ["arm-gcc", "arm-clang"],
     "mcx": ["arm-gcc"],

diff --git a/.github/workflows/hil_test.yml b/.github/workflows/hil_test.yml
@@ -28,11 +28,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # ---------------------------------------
+  # Build Non Espressif
+  # ---------------------------------------
   build:
     if: github.repository_owner == 'hathach'
     runs-on: ubuntu-latest
     outputs:
-      BOARDS_ALL: ${{ steps.parse_hil_json.outputs.BOARDS_ALL }}
+      BOARDS_LIST: ${{ steps.parse_hil_json.outputs.BOARDS_LIST }}
     steps:
       - name: Checkout TinyUSB
         uses: actions/checkout@v4
@@ -46,29 +49,62 @@ jobs:
         id: parse_hil_json
         run: |
           sudo apt install -y jq
-          # BOARDS_ALL is all boards
-          BOARDS_ALL=$(jq -r '.boards[] | "-b " + .name' test/hil/pi4.json | tr '\n' ' ')
-          echo "BOARDS_ALL=$BOARDS_ALL"
-          echo "BOARDS_ALL=$BOARDS_ALL" >> $GITHUB_OUTPUT
-          echo "BOARDS_ALL=$BOARDS_ALL" >> $GITHUB_ENV
 
           # Non-Espresif boards
-          BOARDS_NON_ESP=$(jq -r '.boards[] | select(.flasher != "esptool") | "-b " + .name' test/hil/pi4.json | tr '\n' ' ')
-          echo "BOARDS_NON_ESP=$BOARDS_NON_ESP"
-          echo "BOARDS_NON_ESP=$BOARDS_NON_ESP" >> $GITHUB_ENV
-
-          # Espressif boards
-          BOARDS_ESP=$(jq -r '.boards[] | select(.flasher == "esptool") | "-b " + .name' test/hil/pi4.json | tr '\n' ' ')
-          echo "BOARDS_ESP=$BOARDS_ESP"
-          echo "BOARDS_ESP=$BOARDS_ESP" >> $GITHUB_ENV
+          BOARDS_LIST=$(jq -r '.boards[] | select(.flasher != "esptool") | "-b " + .name' test/hil/pi4.json | tr '\n' ' ')
+          echo "BOARDS_LIST=$BOARDS_LIST"
+          echo "BOARDS_LIST=$BOARDS_LIST" >> $GITHUB_ENV
+          echo "BOARDS_LIST=$BOARDS_LIST" >> $GITHUB_OUTPUT
 
       - name: Setup ARM Toolchain
         uses: ./.github/actions/setup_toolchain
         with:
           toolchain: 'arm-gcc'
 
+      - name: Get Dependencies
+        uses: ./.github/actions/get_deps
+        with:
+          arg: ${{ env.BOARDS_LIST }}
+
+      - name: Build
+        run: python tools/build.py $BOARDS_LIST
+
+      - name: Upload Artifacts for Hardware Testing
+        uses: actions/upload-artifact@v4
+        with:
+          name: hil_pi4
+          path: |
+            cmake-build/cmake-build-*/*/*/*.elf
+            cmake-build/cmake-build-*/*/*/*.bin
+
+  # ---------------------------------------
+  # Build Espressif
+  # ---------------------------------------
+  build-esp:
+    runs-on: ubuntu-latest
+    outputs:
+      BOARDS_LIST: ${{ steps.parse_hil_json.outputs.BOARDS_LIST }}
+    steps:
+      - name: Checkout TinyUSB
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Parse HIL json
+        id: parse_hil_json
+        run: |
+          sudo apt install -y jq
+          # Espressif boards
+          BOARDS_LIST=$(jq -r '.boards[] | select(.flasher == "esptool") | "-b " + .name' test/hil/pi4.json | tr '\n' ' ')
+          echo "BOARDS_LIST=$BOARDS_LIST"
+          echo "BOARDS_LIST=$BOARDS_LIST" >> $GITHUB_ENV
+          echo "BOARDS_LIST=$BOARDS_LIST" >> $GITHUB_OUTPUT
+
       - name: Setup ESP-IDF
-        if: env.BOARDS_ESP != ''
+        if: env.BOARDS_LIST != ''
         uses: ./.github/actions/setup_toolchain
         with:
           toolchain: 'esp-idf'
@@ -77,38 +113,34 @@ jobs:
       - name: Get Dependencies
         uses: ./.github/actions/get_deps
         with:
-          arg: ${{ env.BOARDS_ALL }}
-
-      - name: Build
-        run: python tools/build.py $BOARDS_NON_ESP
+          arg: ${{ env.BOARDS_LIST }}
 
       - name: Build Espressif
-        if: env.BOARDS_ESP != ''
-        run: docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python3 tools/build.py $BOARDS_ESP
+        if: env.BOARDS_LIST != ''
+        run: docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python3 tools/build.py $BOARDS_LIST
 
       - name: Upload Artifacts for Hardware Testing
         uses: actions/upload-artifact@v4
         with:
-          name: hil_pi4
+          name: hil_pi4_esp
           path: |
-            cmake-build/cmake-build-*/*/*/*.elf
-            cmake-build/cmake-build-*/*/*/*.bin
-            # For Espressif
             cmake-build/cmake-build-*/*/*/bootloader/bootloader.bin
             cmake-build/cmake-build-*/*/*/partition_table/partition-table.bin
             cmake-build/cmake-build-*/*/*/config.env
             cmake-build/cmake-build-*/*/*/flash_args
 
   # ---------------------------------------
   # Hardware in the loop (HIL)
-  # Current self-hosted instance is running on an RPI4. For attached hardware checkout hil_pi4.json
+  # Current self-hosted instance is running on an RPI4. For attached hardware checkout test/hil/pi4.json
   # ---------------------------------------
   hil-pi4:
     if: github.repository_owner == 'hathach'
-    needs: build
+    needs:
+      - build
+      - build-esp
     runs-on: [self-hosted, rp2040, nrf52840, esp32s3, hardware-in-the-loop]
     env:
-        BOARDS_ALL: ${{ needs.build.outputs.BOARDS_ALL }}
+        BOARDS_LIST: "${{ needs.build.outputs.BOARDS_LIST }} ${{ needs.build-esp.outputs.BOARDS_LIST }}"
     steps:
       - name: Clean workspace
         run: |
@@ -137,5 +169,5 @@ jobs:
 
       - name: Test on actual hardware
         run: |
-          echo "BOARDS_ALL=$BOARDS_ALL"
-          python3 test/hil/hil_test.py $BOARDS_ALL pi4.json
+          echo "BOARDS_LIST=$BOARDS_LIST"
+          python3 test/hil/hil_test.py $BOARDS_LIST pi4.json