Merge branch 'master' into ESPIDF-Littlefs

.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

bin/build-esp32.sh

@@ -37,5 +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/partitions.bin
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR