From 226a2dfe04f031858b102e1aa5be568252b4660d Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 26 Sep 2022 15:48:02 -0500 Subject: [PATCH 1/4] Include partitions.bin --- .github/workflows/main_matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index e41e8709..1d15e29b 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -360,7 +360,7 @@ jobs: id: version - name: Move files up - run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/system-info.bin ./**/firmware*.bin ./**/*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat + run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/system-info.bin ./*tbeam-1*/partitions.bin ./**/firmware*.bin ./**/*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat - name: Repackage in single firmware zip uses: actions/upload-artifact@v2 From 498ac00b9293019c8e4b243e9933e6e8e6a4ade2 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 26 Sep 2022 15:51:09 -0500 Subject: [PATCH 2/4] Copy cpartitions.bin --- bin/build-esp32.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh index 375e0288..e975e4d9 100755 --- a/bin/build-esp32.sh +++ b/bin/build-esp32.sh @@ -36,6 +36,7 @@ echo "Building Filesystem for ESP32 targets" pio run --environment tbeam -t buildfs cp .pio/build/tbeam/spiffs.bin $OUTDIR/littlefs-$VERSION.bin cp images/system-info.bin $OUTDIR/system-info.bin +cp .pio/build/tbeam/partitions.bin $OUTDIR/partitions.bin cp bin/device-install.* $OUTDIR cp bin/device-update.* $OUTDIR From da29fa139ffcc599baf7970330032169961600a9 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 26 Sep 2022 16:00:20 -0500 Subject: [PATCH 3/4] Copy the current one --- bin/build-esp32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh index e975e4d9..ad6a9634 100755 --- a/bin/build-esp32.sh +++ b/bin/build-esp32.sh @@ -36,7 +36,7 @@ echo "Building Filesystem for ESP32 targets" pio run --environment tbeam -t buildfs cp .pio/build/tbeam/spiffs.bin $OUTDIR/littlefs-$VERSION.bin cp images/system-info.bin $OUTDIR/system-info.bin -cp .pio/build/tbeam/partitions.bin $OUTDIR/partitions.bin +cp .pio/build/$1/partitions.bin $OUTDIR/$1-partitions.bin cp bin/device-install.* $OUTDIR cp bin/device-update.* $OUTDIR From 7f179deaf32dba8df64eca24f22a8ab18f3b75ed Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 26 Sep 2022 16:01:28 -0500 Subject: [PATCH 4/4] Update build-esp32.sh --- bin/build-esp32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh index ad6a9634..1f6a7aed 100755 --- a/bin/build-esp32.sh +++ b/bin/build-esp32.sh @@ -37,6 +37,6 @@ pio run --environment tbeam -t buildfs cp .pio/build/tbeam/spiffs.bin $OUTDIR/littlefs-$VERSION.bin cp images/system-info.bin $OUTDIR/system-info.bin -cp .pio/build/$1/partitions.bin $OUTDIR/$1-partitions.bin +cp .pio/build/$1/partitions.bin $OUTDIR/partitions.bin cp bin/device-install.* $OUTDIR cp bin/device-update.* $OUTDIR