Improve build

Author: raphaelcoeffic

.github/workflows/actions.yml

@@ -10,10 +10,7 @@ on:
       - '**.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/nightly.yml'
-      - '.github/workflows/linux_cpn.yml'
-      - '.github/workflows/macosx_cpn.yml'
-      - '.github/workflows/win-cpn-32.yml'
-      - '.github/workflows/win_cpn-64.yml'
+      - '.github/workflows/companion.yml'
       - '.github/workflows/validate_fw_json.yml'
       - 'companion/**'
       - '.gitpod.yml'
@@ -26,10 +23,7 @@ on:
       - '**.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/workflows/nightly.yml'
-      - '.github/workflows/linux_cpn.yml'
-      - '.github/workflows/macosx_cpn.yml'
-      - '.github/workflows/win-cpn-32.yml'
-      - '.github/workflows/win_cpn-64.yml'
+      - '.github/workflows/companion.yml'
       - '.github/workflows/validate_fw_json.yml'
       - 'companion/**'
       - '.gitpod.yml'
@@ -44,27 +38,21 @@ jobs:
     strategy:
       matrix:
         target:
-          - x9dp2019
+          - x9dp2019;x9e
           - tx15
           - tx16s
           - nv14
           - el18
           - pl18
           - pl18ev
-          - t12max
+          - t12max;t14
           - t15
           - t16
           - t18
-          - tlite #STM32F2
-          - t20
-          - t14
-          - t20v2
-          - tx12 #STM32F2
+          - t20;t20v2
           - x10
           - x12s
-          - x9e
-          - mt12
-          - gx12
+          - mt12;gx12
           - nb4p
           - st16
     container:
@@ -76,7 +64,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          # fetch-depth: 0 # https://github.com/actions/checkout#Fetch-all-history-for-all-tags-and-branches
 
       - name: Test ${{ matrix.target }}
         env:
@@ -85,7 +72,6 @@ jobs:
           echo "Running commit tests"
           ./tools/commit-tests.sh
 
-
   build:
     name: Run builds
     needs: test
@@ -94,26 +80,20 @@ jobs:
       matrix:
         target:
           - nv14;el18
-          - pl18;pl18ev;pl18u
-          - pa01
-          - t12max
-          - t15;t16;t18
-          - zorro;pocket;mt12;commando8
+          - pl18;pl18ev
+          - pl18u;pa01
+          - t15;t16
+          - t14;t18;mt12
+          - zorro;pocket;commando8
           - tprov2;tpros;bumblebee
-          - t20;t20v2;t14
-          - tx12mk2;boxer;gx12
-          - tx15
-          - tx16s
-          - f16
+          - mt12;gx12;t20;t20v2
+          - t12max;tx12mk2;boxer
+          - tx15;tx16s
+          - x12s;f16
           - v12;v14;v16
           - x10;x10express
-          - x12s
-          - x7access
-          - x9dp2019
-          - x9e;x9e-hall
-          - mt12;gx12
-          - nb4p
-          - st16
+          - x7access;x9dp2019;x9e;x9e-hall
+          - nb4p;st16
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
       volumes:
@@ -149,7 +129,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Compose release filename
-        # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
         run: echo "artifact_name=edgetx-firmware-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Merge firmware artifact packages

.github/workflows/companion.yml

@@ -22,15 +22,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-modules:
+  modules:
     name: WASM Modules
     runs-on: macos-14
+    strategy:
+      matrix:
+        target:
+          - nv14;el18;pl18;pl18ev
+          - pl18u;t15;t16;t18
+          - zorro;pocket;mt12;commando8;tprov2;tpros;bumblebee;t14
+          - mt12;gx12;t20;t20v2;t12max;tx12mk2;boxer
+          - tx15;tx16s;x12s;f16
+          - v12;v14;v16;x10;x10express
+          - x7access;x9dp2019;x9e;x9e-hall
+          - nb4p;st16;pa01
 
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: true
 
       - name: Setup Python Dependencies
         uses: ./.github/actions/python_dependencies
@@ -41,26 +52,24 @@ jobs:
       - name: Build modules
         shell: bash
         env:
+          FLAVOR: ${{ matrix.target }}
           CMAKE_BUILD_TYPE: 'Release'
         run: |
           mkdir output && \
           tools/build-wasm-modules.sh "$(pwd)" "$(pwd)/output/"
 
-      - name: Compose artifact name
-        run: echo "artifact_name=edgetx-modules-${GITHUB_REF##*/}" >> $GITHUB_ENV
-        shell: bash
-
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: "${{ env.artifact_name }}"
+          name: wasm-modules-${{ matrix.target }}
           path:  ${{github.workspace}}/output
+          if-no-files-found: error
           retention-days: 15
 
   build-linux:
     name: Linux Companion
     runs-on: ubuntu-latest
-    if: false
+    needs: modules
 
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
@@ -81,7 +90,7 @@ jobs:
   build-macos:
     name: macOS Companion
     runs-on: macos-14
-    if: false
+    needs: modules
 
     env:
       CMAKE_OSX_ARCHITECTURES: 'x86_64'
@@ -102,7 +111,7 @@ jobs:
   build-win64:
     name: Windows Companion
     runs-on: windows-2022
-    if: false
+    needs: modules
 
     env:
       CMAKE_GENERATOR: 'Ninja'

tools/build-wasm-modules.sh

@@ -163,24 +163,37 @@ build_plugin() {
     return 0
 }
 
-declare -a simulator_plugins=(
-    x7access x9dp2019 x9e
-    t12max tx12mk2 t15 t16 t18 t20 t20v2
-    x10 x10express x12s
-    zorro tx16s tx15
-    commando8 boxer pocket mt12 gx12
-    tprov2 tpros bumblebee t14
-    nv14 el18 pl18 pl18ev pl18u st16 pa01
-    f16 v14 v16
-)
-
-TOTAL=${#simulator_plugins[@]}
+if [[ -n "$FLAVOR" ]]; then
+    # Convert semicolon-separated string to array
+    IFS=';' read -ra temp_array <<< "$FLAVOR"
+    plugins=()
+    for item in "${temp_array[@]}"; do
+        plugins+=($(echo "$item" | tr '[:upper:]' '[:lower:]'))
+    done
+else
+    declare -a plugins=(
+        # monochrom
+        boxer bumblebee commando8
+        gx12 mt12 pocket t12max
+        t14 t20 t20v2 tpros tprov2
+        tx12mk2 zorro v14
+        x7access x9dp2019 x9e
+        # colour
+        el18 nv14 st16 pa01
+        pl18 pl18ev pl18u
+        t15 t16 t18
+        tx15 tx16s f16 v16
+        x10 x10express x12s
+    )
+fi
+
+TOTAL=${#plugins[@]}
 FAILED_PLUGINS=()
 
 echo "🔨 Building $TOTAL Plugins"
 
-for i in "${!simulator_plugins[@]}"; do
-    plugin="${simulator_plugins[$i]}"
+for i in "${!plugins[@]}"; do
+    plugin="${plugins[$i]}"
     current=$((i + 1))
     percent=$((current * 100 / TOTAL))
 

tools/commit-tests.sh

@@ -78,12 +78,8 @@ do
     fi
 
     cmake ${BUILD_OPTIONS} "${SRCDIR}"
-
-    cmake --build . --target arm-none-eabi-configure
-    cmake --build arm-none-eabi -j"${CORES}" --target ${FIRMARE_TARGET}
-
     cmake --build . --target native-configure
     cmake --build native -j"${CORES}" --target tests-radio
 
-    rm -f CMakeCache.txt native/CMakeCache.txt arm-none-eabi/CMakeCache.txt
+    rm -f CMakeCache.txt native/CMakeCache.txt
 done