diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b1424419..8c0f0eb1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,9 +78,16 @@ jobs: - name: Build everything run: bin/build-all.sh - - name: Store release zip as an artifact + - name: Store binaries as an artifact uses: actions/upload-artifact@v2 with: name: built path: release/archive/firmware-*.zip retention-days: 30 + + - name: Store debugging elf files as an artifact + uses: actions/upload-artifact@v2 + with: + name: debug-elfs + path: release/archive/elfs-*.zip + retention-days: 7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 470614817..3403a145d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} - - name: Add artifact to release + - name: Add bins to release uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ github.token }} @@ -77,4 +77,14 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: release/archive/firmware-${{ steps.version.outputs.version }}.zip asset_name: firmware-${{ steps.version.outputs.version }}.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip + + - name: Add debug elfs to release + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip + asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip + asset_content_type: application/zip \ No newline at end of file diff --git a/bin/build-all.sh b/bin/build-all.sh index a821737c4..dc614cf6f 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -10,6 +10,7 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 helt # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine BOARDS_NRF52="rak4631 t-echo" +#BOARDS_NRF52="" OUTDIR=release/latest @@ -99,5 +100,8 @@ XML echo Generating $ARCHIVEDIR/firmware-$VERSION.zip rm -f $ARCHIVEDIR/firmware-$VERSION.zip zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/spiffs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* images/system-info.bin bin/device-install.* bin/device-update.* +echo Generating $ARCHIVEDIR/elfs-$VERSION.zip +rm -f $ARCHIVEDIR/elfs-$VERSION.zip +zip --junk-paths $ARCHIVEDIR/elfs-$VERSION.zip $OUTDIR/elfs/universal/firmware-*-$VERSION.* echo BUILT ALL