From 2cf3c105a169782bd81106d51b0f343439e6c1f3 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 12 Oct 2022 08:05:00 -0500 Subject: [PATCH] Add DFU package for nrf52 assets to build assets --- .github/workflows/main_matrix.yml | 3 ++- bin/build-nrf52.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index e5ed1a71..e2029b27 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -224,6 +224,7 @@ jobs: path: | release/*.uf2 release/*.elf + release/*.zip retention-days: 90 build-rpi2040: @@ -368,7 +369,7 @@ jobs: id: version - name: Move files up - run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat + run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat - name: Repackage in single firmware zip uses: actions/upload-artifact@v2 diff --git a/bin/build-nrf52.sh b/bin/build-nrf52.sh index 2202564e..76972b10 100755 --- a/bin/build-nrf52.sh +++ b/bin/build-nrf52.sh @@ -26,7 +26,9 @@ basename=firmware-$1-$VERSION pio run --environment $1 # -v SRCELF=.pio/build/$1/firmware.elf +DFUPKG=.pio/build/$1/firmware.zip cp $SRCELF $OUTDIR/$basename.elf +cp $DFUPKG $OUTDIR/$basename-ota.zip echo "Generating NRF52 uf2 file" SRCHEX=.pio/build/$1/firmware.hex