Merge pull request #2622 from hathach/ci-update

Ci update

3 files changed, 19 insertions, 20 deletions

diff --git a/.github/workflows/build_arm.yml b/.github/workflows/build_arm.yml
index 12e6615ea..14c6d519c 100644
--- a/.github/workflows/build_arm.yml
+++ b/.github/workflows/build_arm.yml
@@ -35,14 +35,7 @@ jobs:
       matrix:
         family:
         # Alphabetical order
-        - 'broadcom_32bit'
-        - 'kinetis_k32l2'
-        - 'lpc11 lpc13 lpc15'
-        - 'lpc51'
-        - 'mm32 msp432e4'
-        - 'samd11 same5x saml2x'
-        - 'stm32l0 stm32wb'
-        - 'tm4c123 xmc4000'
+        - 'mm32'
     steps:
     - name: Setup Python
       uses: actions/setup-python@v5
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 65de47e8d..c1f85ad9c 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -37,16 +37,19 @@ jobs:
       matrix:
         family:
           # Alphabetical order
+          - 'broadcom_32bit'
           - 'imxrt'
-          - 'kinetis_k kinetis_kl'
+          - 'kinetis_k kinetis_kl kinetis_k32l2'
+          - 'lpc11 lpc13 lpc15'
           - 'lpc17 lpc18 lpc40 lpc43'
-          - 'lpc54 lpc55'
+          - 'lpc51 lpc54 lpc55'
           - 'mcx'
+          - 'msp432e4'
+          - 'mm32'
           - 'nrf'
           - 'ra'
           - 'rp2040'
-          - 'samd21'
-          - 'samd51'
+          - 'samd11 samd21 saml2x samd5x_e5x samg'
           - 'stm32f0'
           - 'stm32f1'
           - 'stm32f2'
@@ -59,6 +62,9 @@ jobs:
           - 'stm32h7'
           - 'stm32l4'
           - 'stm32u5'
+          - 'stm32wb'
+          - 'tm4c'
+          - 'xmc4000'
     steps:
     - name: Setup Python
       uses: actions/setup-python@v5
@@ -87,12 +93,12 @@ jobs:
         python3 tools/get_deps.py ${{ matrix.family }}
 
     - name: Build
-      run: python tools/build_cmake.py ${{ matrix.family }} -DCMAKE_BUILD_TYPE=MinSizeRel
+      run: python tools/build_cmake.py ${{ matrix.family }}
       env:
         PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
 
     - name: Upload Artifacts for Hardware Testing (rp2040)
-      if: matrix.family == 'rp2040' && github.repository_owner == 'hathach'
+      if: contains(matrix.family, 'rp2040') && github.repository_owner == 'hathach'
       uses: actions/upload-artifact@v4
       with:
         name: raspberry_pi_pico
@@ -100,7 +106,7 @@ jobs:
           cmake-build/cmake-build-raspberry_pi_pico/*/*/*.elf
 
     - name: Upload Artifacts for Hardware Testing (nRF)
-      if: matrix.family == 'nrf' && github.repository_owner == 'hathach'
+      if: contains(matrix.family, 'nrf') && github.repository_owner == 'hathach'
       uses: actions/upload-artifact@v4
       with:
         name: feather_nrf52840_express
@@ -108,7 +114,7 @@ jobs:
           cmake-build/cmake-build-feather_nrf52840_express/*/*/*.elf
 
     - name: Upload Artifacts for Hardware Testing (samd51)
-      if: matrix.family == 'samd51' && github.repository_owner == 'hathach'
+      if: contains(matrix.family, 'samd5x_e5x') && github.repository_owner == 'hathach'
       uses: actions/upload-artifact@v4
       with:
         name: itsybitsy_m4
@@ -134,7 +140,7 @@ jobs:
           #- 'ra' port later
           #- 'rp2040' port later
           - 'samd21'
-          - 'samd51'
+          - 'samd5x_e5x'
           - 'stm32f0'
           - 'stm32f1'
           - 'stm32f2'
@@ -188,7 +194,7 @@ jobs:
           python3 tools/get_deps.py ${{ matrix.family }}
 
       - name: Build
-        run: python tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=clang -DCMAKE_BUILD_TYPE=MinSizeRel
+        run: python tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=clang
         env:
           PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
 
@@ -236,7 +242,7 @@ jobs:
           python3 tools/get_deps.py ${{ matrix.family }}
 
       - name: Build
-        run: python tools/build_cmake.py ${{ matrix.family }} -DCMAKE_BUILD_TYPE=MinSizeRel
+        run: python tools/build_cmake.py ${{ matrix.family }}
 
   # ---------------------------------------
   # Hardware in the loop (HIL)
diff --git a/.github/workflows/build_iar.yml b/.github/workflows/build_iar.yml
index 499349904..6b1493a97 100644
--- a/.github/workflows/build_iar.yml
+++ b/.github/workflows/build_iar.yml
@@ -52,7 +52,7 @@ jobs:
         run: python3 tools/get_deps.py ${{ matrix.family }}
 
       - name: Build
-        run: python3 tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=iar -DCMAKE_BUILD_TYPE=MinSizeRel
+        run: python3 tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=iar
 
       - name: Test on actual hardware (hardware in the loop)
         run: |