diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f280c9..4fd4dee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,8 +12,10 @@ jobs: runs-on: ubuntu-latest if: | github.event.pull_request.merged == true && - (startsWith(github.event.pull_request.head.ref, 'hotfix/v') || - startsWith(github.event.pull_request.head.ref, 'release/v')) + (contains(github.event.pull_request.head.ref, 'hotfix/v') || + contains(github.event.pull_request.head.ref, 'Hotfix/v') || + contains(github.event.pull_request.head.ref, 'release/v') || + contains(github.event.pull_request.head.ref, 'Release/v')) outputs: version: ${{ steps.get_version.outputs.version }} steps: @@ -32,13 +34,16 @@ jobs: include: - os: windows-latest build_os: windows - artifact: RTT-GCS-windows-x64.zip + artifact_name: Radio Telemetry Tracker Drone Ground Control Station.exe + release_name: RTT-GCS-windows-x64.exe - os: ubuntu-latest build_os: linux - artifact: RTT-GCS-linux-x64.zip + artifact_name: Radio Telemetry Tracker Drone Ground Control Station + release_name: RTT-GCS-linux-x64 - os: macos-latest build_os: macos - artifact: RTT-GCS-macos-x64.zip + artifact_name: Radio Telemetry Tracker Drone Ground Control Station + release_name: RTT-GCS-macos-x64 runs-on: ${{ matrix.os }} @@ -75,8 +80,8 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: ${{ matrix.artifact }} - path: dist/${{ matrix.artifact }} + name: ${{ matrix.release_name }} + path: dist/${{ matrix.artifact_name }} # Create release after all builds complete create_release: @@ -94,9 +99,9 @@ jobs: tag_name: v${{ needs.check_release.outputs.version }} name: Release v${{ needs.check_release.outputs.version }} files: | - dist/RTT-GCS-windows-x64.zip/RTT-GCS-windows-x64.zip - dist/RTT-GCS-linux-x64.zip/RTT-GCS-linux-x64.zip - dist/RTT-GCS-macos-x64.zip/RTT-GCS-macos-x64.zip + dist/RTT-GCS-windows-x64.exe/Radio Telemetry Tracker Drone Ground Control Station.exe + dist/RTT-GCS-linux-x64/Radio Telemetry Tracker Drone Ground Control Station + dist/RTT-GCS-macos-x64/Radio Telemetry Tracker Drone Ground Control Station draft: false prerelease: false env: diff --git a/README.md b/README.md index c11ef2c..7b98dff 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,7 @@ The **GCS** complements the **FDS** software (which runs on the drone payload), ### Prebuilt Releases -Precompiled executables are availabe under the [**Releases** tab](https://github.com/UCSD-E4E/radio-telemetry-tracker-drone-gcs/releases). You will typically see three artifacts: - -- **Windows**: `RTT-GCS-windows-x64.zip` -- **Linux**: `RTT-GCS-linux-x64.zip` -- **macOS**: `RTT-GCS-macos-x64.zip` +Precompiled executables are availabe under the [**Releases** tab](https://github.com/UCSD-E4E/radio-telemetry-tracker-drone-gcs/releases). Download the one for your platform, unzip it, and run the executable.