Merge tag 'template_v2.4.1' into merge/template_v2.4.1

template_v2.4.1
golioth · Sep 30, 2024 · 3c86244 · 3c86244
1 parent 1ab3415
commit 3c86244
Show file tree

Hide file tree

Showing 20 changed files with 493 additions and 217 deletions.
diff --git a/.github/workflows/build_zephyr.yml b/.github/workflows/build_zephyr.yml
@@ -60,17 +60,20 @@ jobs:
 
       - name: Build with West
         run: |
-          west build -p -b ${{ inputs.BOARD }} app
+          west build -p -b ${{ inputs.BOARD }} --sysbuild app
 
       - name: Prepare artifacts
+        shell: bash
         if: inputs.ARTIFACT == true && inputs.TAG != ''
 
         run: |
-          cd build/zephyr
+          cd build
           mkdir -p artifacts
-          mv merged.hex     ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_full.hex
-          mv app_update.bin ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_update.bin
-          mv zephyr.elf     ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}.elf
+          BOARD_NICENAME=${{ inputs.BOARD }}
+          BOARD_NICENAME=${BOARD_NICENAME//\//_}
+          mv merged.hex                   ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${BOARD_NICENAME}_full.hex
+          mv app/zephyr/zephyr.signed.bin ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${BOARD_NICENAME}_update.bin
+          mv app/zephyr/zephyr.elf        ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${BOARD_NICENAME}.elf
 
       # Run IDs are unique per repo but are reused on re-runs
       - name: Save artifact
@@ -79,4 +82,4 @@ jobs:
         with:
           name: build_artifacts_${{ github.run_id }}
           path: |
-            build/zephyr/artifacts/*
+            build/artifacts/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,15 +9,15 @@ on:
             version:
                 description: 'Release Version.'
                 required: true
-                default: 'v0.0.0'
+                default: 'template_v0.0.0'
                 type: string
 
 jobs:
     build-binaries:
         strategy:
             matrix:
               ZEPHYR_SDK: [0.16.3]
-              BOARD: ["nrf9160dk_nrf9160_ns","aludel_mini_v1_sparkfun9160_ns"]
+              BOARD: ["nrf9160dk/nrf9160/ns","aludel_mini/nrf9160/ns","aludel_elixir/nrf9160/ns"]
 
         uses: ./.github/workflows/build_zephyr.yml
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,17 +1,30 @@
 # Copyright (c) 2023 Golioth, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-name: Test firmware    
+name: Test firmware
 
 on:
   pull_request:
 
   push:
+    branches: [ main ]
 
 jobs:
-  test_build:
+  test_build_nrf9160dk:
     uses: ./.github/workflows/build_zephyr.yml
     with:
       ZEPHYR_SDK: 0.16.3
-      BOARD: aludel_mini_v1_sparkfun9160_ns
-      ARTIFACT: false
+      BOARD: nrf9160dk/nrf9160/ns
+      ARTIFACT: false
+  test_build_aludel_elixir:
+    uses: ./.github/workflows/build_zephyr.yml
+    with:
+      ZEPHYR_SDK: 0.16.3
+      BOARD: aludel_elixir/nrf9160/ns
+      ARTIFACT: false
+  test_build_aludel_mini:
+    uses: ./.github/workflows/build_zephyr.yml
+    with:
+      ZEPHYR_SDK: 0.16.3
+      BOARD: aludel_mini/nrf9160/ns
+      ARTIFACT: false