Merge branch 'master' into Build-Image

This commit is contained in:
Thomas Göttgens 2022-10-01 10:31:59 +02:00 committed by GitHub
commit 32990856e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -153,12 +153,9 @@ jobs:
with: with:
repo: "meshtastic/Meshtastic-OTA" repo: "meshtastic/Meshtastic-OTA"
file: "firmware.bin" file: "firmware.bin"
target: "release/bleota.bin"
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Move OTA Firmware
run: |
mv firmware.bin release/bleota.bin
- name: Get release version string - name: Get release version string
run: echo "::set-output name=version::$(./bin/buildinfo.py long)" run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
id: version id: version
@ -371,7 +368,7 @@ jobs:
id: version id: version
- name: Move files up - name: Move files up
run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/bleota.bin ./*tbeam-1*/system-info.bin ./*tbeam-1*/partitions.bin ./**/firmware*.bin ./**/*.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 ./**/*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat
- name: Repackage in single firmware zip - name: Repackage in single firmware zip
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2