diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index e3d1dbadb..20d71f833 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -371,7 +371,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 ./**/firmware-*-ota.zip ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat + run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/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@v3 diff --git a/protobufs b/protobufs index 46bc0afe0..ed9f2499d 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 46bc0afe050a836b6ec8b235c3ff55e9e037efcb +Subproject commit ed9f2499d692925461facd64c6af2d2a7672245a diff --git a/version.properties b/version.properties index 0dbcdca97..7d6851090 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] -major = 1 -minor = 3 -build = 49 +major = 2 +minor = 0 +build = 0