ci: fix frozen bootloader references

This patch hopefully fixes the remaining references to the bootloader files. Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
hello-nrfcloud · Oct 30, 2024 · 939fe69 · 939fe69
1 parent 5f7a45e
commit 939fe69
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/attach_release_assets.yml b/.github/workflows/attach_release_assets.yml
@@ -38,6 +38,8 @@ jobs:
             files: |
               hello.nrfcloud.com-*.*
               connectivity-bridge*.*
+              nrf91-bl-*.hex
+              nrf53-bl-*.hex
 
         - name: Trigger workflow that publishes firmware bundles to nRF Cloud
           working-directory: .github/workflows

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -128,6 +128,7 @@ jobs:
           cp app/zephyr/zephyr.signed.hex hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-update-signed.hex
           cp app/zephyr/zephyr.elf hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91.elf
           cp dfu_application.zip hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-dfu.zip
+          cp ../../../nrf91-bl-*.hex thingy91x-oob/app/build/
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -137,6 +138,7 @@ jobs:
           if-no-files-found: error
           path: |
             thingy91x-oob/app/build/hello.nrfcloud.com-*.*
+            thingy91x-oob/app/build/nrf91-bl-*.hex
 
       # Out-of-box debug firmware build
 
@@ -173,7 +175,6 @@ jobs:
           path: |
             thingy91x-oob/app/build/hello.nrfcloud.com-*.*
 
-
       # Connectivity Bridge firmware build
 
       - name: Build nrf53 firmware
@@ -202,6 +203,7 @@ jobs:
         run: |
           cp $(pwd)/nrf/applications/connectivity_bridge/build/dfu_application.zip \
             $(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-dfu.zip
+          cp nrf53-bl-*.hex nrf/applications/connectivity_bridge/build/
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -211,6 +213,7 @@ jobs:
           if-no-files-found: error
           path: |
             nrf/applications/connectivity_bridge/build/connectivity-bridge-*.*
+            nrf/applications/connectivity_bridge/build/nrf53-bl-*.hex
 
       # Bootloader update build
 
@@ -238,8 +241,6 @@ jobs:
           path: |
             thingy91x-oob/hello.nrfcloud.com-*.*
             thingy91x-oob/connectivity-bridge-*.*
-            nrf53-bl-*.hex
-            nrf91-bl-*.hex
 
       - name: Print run-id and fw version
         run: |

diff --git a/.github/workflows/on_target.yml b/.github/workflows/on_target.yml
@@ -162,7 +162,7 @@ jobs:
           NRF53_APP_HEX_FILE: artifacts/connectivity-bridge-${{ inputs.artifact_fw_version }}-thingy91x-nrf53-app.hex
           NRF53_APP_UPDATE_ZIP: artifacts/connectivity-bridge-${{ inputs.artifact_fw_version }}-thingy91x-nrf53-verbose.zip
           NRF53_BL_UPDATE_ZIP: artifacts/connectivity-bridge-${{ inputs.artifact_fw_version }}-thingy91x-nrf53-bootloader.zip
-          NRF91_HEX_FILE: artifacts/hello.nrfcloud.com-${{ inputs.artifact_fw_version }}-thingy91x-nrf91-bootloader.hex
+          NRF91_HEX_FILE: artifacts/nrf91-bl-v2.hex
           NRF91_APP_UPDATE_ZIP: artifacts/hello.nrfcloud.com-${{ inputs.artifact_fw_version }}-thingy91x-nrf91-dfu.zip
           NRF91_BL_UPDATE_ZIP: artifacts/hello.nrfcloud.com-${{ inputs.artifact_fw_version }}-thingy91x-nrf91-bootloader.zip
           LOG_FILENAME: oob_dfu_test_log