diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index 3204b272..da5cbc82 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -56,6 +56,9 @@ jobs: - name: Unzip world map run: | unzip world_map.zip -d sdcard/ADSB + - name: Create Firmware TAR + run: | + mkdir -p firmware_tar/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin firmware_tar/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p firmware_tar/APPS && cp build/firmware/application/*.ppma firmware_tar/APPS && cd firmware_tar && tar -cvaf ../portapack-mayhem.ppfw.tar * - name: Create Firmware ZIP run: | zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip * @@ -64,7 +67,7 @@ jobs: mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && zip -r sdcard.zip sdcard - name: Create changelog env: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | CHANGELOG=$(python3 .github/workflows/changelog.py) CHANGELOG="${CHANGELOG//'%'/'%25'}" @@ -88,6 +91,16 @@ jobs: ${{ steps.changelog.outputs.content }} draft: false prerelease: true + - name: Upload Firmware TAR Asset + id: upload-firmware-tar-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./portapack-mayhem.ppfw.tar + asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}.ppfw.tar + asset_content_type: application/x-tar - name: Upload Firmware Asset id: upload-firmware-asset uses: actions/upload-release-asset@v1 diff --git a/.github/workflows/create_stable_release.yml b/.github/workflows/create_stable_release.yml index 8255787f..7045380b 100644 --- a/.github/workflows/create_stable_release.yml +++ b/.github/workflows/create_stable_release.yml @@ -40,6 +40,9 @@ jobs: - name: Unzip world map run: | unzip world_map.zip -d sdcard/ADSB + - name: Create Firmware TAR + run: | + mkdir -p firmware_tar/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin firmware_tar/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p firmware_tar/APPS && cp build/firmware/application/*.ppma firmware_tar/APPS && cd firmware_tar && tar -cvaf ../portapack-mayhem.ppfw.tar * - name: Create Firmware ZIP run: | zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip * @@ -48,7 +51,7 @@ jobs: mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && zip -r sdcard.zip sdcard - name: Create changelog env: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | CHANGELOG=$(python3 .github/workflows/changelog.py ${{ steps.past_version.outputs.past_version }}) CHANGELOG="${CHANGELOG//'%'/'%25'}" @@ -82,6 +85,16 @@ jobs: For certain functionality, like external apps, the world map, GPS simulator, and others you need to uncompress (using [7-zip](https://www.7-zip.org/download.html)) the files from `mayhem_vX.Y.Z_COPY_TO_SDCARD.zip` to a FAT32 formatted MicroSD card. draft: true prerelease: false + - name: Upload Firmware TAR Asset + id: upload-firmware-tar-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./portapack-mayhem.ppfw.tar + asset_name: mayhem_${{ steps.version.outputs.version }}.ppfw.tar + asset_content_type: application/x-tar - name: Upload Firmware Asset id: upload-firmware-asset uses: actions/upload-release-asset@v1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 060e85cf..00000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -language: cpp - -matrix: - include: - - os: linux - compiler: gcc - cache: apt - dist: xenial - -env: - global: - - PROJECT_NAME=PortaPack-HAVOC - - SHORT_COMMIT_HASH=`git rev-parse --short HEAD` - - VERSION_STRING=nightly-$SHORT_COMMIT_HASH - - BUILD_DATE="`date +%Y-%m-%d`" - - BUILD_NAME="$PROJECT_NAME-$BUILD_DATE-$SHORT_COMMIT_HASH" - - ARTEFACT_BASE=$TRAVIS_BUILD_DIR/artefacts/ - - ARTEFACT_PATH=$ARTEFACT_BASE/$BUILD_NAME - -before_install: - - sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y - - sudo apt-get update -q - - sudo apt-get install gcc-arm-embedded -y - -script: - # TODO: Introduce top-level Makefile, this is lame. - - sed -e "s/\#set(VERSION.*/set(VERSION \"$VERSION_STRING\")/" -i".bak" CMakeLists.txt - - mkdir build/ - - pushd build/ - - cmake .. - - make firmware - - popd - -after_success: - - mkdir -p $ARTEFACT_PATH - # Copy firmware to firmware-bin directory - - cd $TRAVIS_BUILD_DIR/build - - cp firmware/portapack-h1-havoc.bin $ARTEFACT_PATH/ - - cp hackrf/firmware/hackrf_usb/hackrf_usb.dfu $ARTEFACT_PATH/ - - cd $TRAVIS_BUILD_DIR - - cp LICENSE $ARTEFACT_PATH/ - # Build the archive - - cd $ARTEFACT_BASE - - tar -cJvf $ARTEFACT_BASE/$BUILD_NAME.tar.xz $BUILD_NAME - - md5sum --binary $BUILD_NAME.tar.xz >MD5SUMS - - sha256sum --binary $BUILD_NAME.tar.xz >SHA256SUMS - -addons: - apt: - packages: - - coreutils - - tar - - sed - - cmake - - dfu-util