From 9054b87dab331d8620f278fb28804765f9923673 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 10 Sep 2024 01:51:44 +0100 Subject: [PATCH] Fix desktop artifact upload --- .github/workflows/desktop-build.yml | 46 +++++++---------------------- release_notes.md | 14 ++++----- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index bd4417632..eac1eee51 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -38,11 +38,6 @@ jobs: cd desktopApp npm install - - name: Install zip utility - run: | - sudo apt-get update - sudo apt-get install -y zip - - name: Build for macOS run: | cd desktopApp @@ -58,21 +53,6 @@ jobs: cd desktopApp npm run package-linux - - name: Create ZIP for macOS Build - run: | - cd desktopApp/release-builds/ - sudo zip -r /desktopApp-mac.zip ./Robosats-darwin-x64/* - - - name: Create ZIP for Windows Build - run: | - cd desktopApp/release-builds/ - sudo zip -r /desktopApp-win.zip ./Robosats-win32-ia32/* - - - name: Create ZIP for Linux Build - run: | - cd desktopApp/release-builds/ - sudo zip -r /desktopApp-linux.zip ./Robosats-linux-x64/* - - name: 'Get Commit Hash' id: commit uses: pr-mpt/actions-commit-hash@v3 @@ -81,8 +61,8 @@ jobs: uses: actions/upload-artifact@v4 if: inputs.semver != '' # only if this workflow is called from a push to tag (a Release) with: - name: robosats-desktop-${{ inputs.semver }}-mac.zip - path: desktopApp/release-builds/desktopApp-mac.zip + name: robosats-desktop-${{ inputs.semver }}-mac-darwin-x64.zip + path: desktopApp/release-builds/Robosats-darwin-x64 - name: 'Upload linux-build Release Artifact (for Release)' uses: actions/upload-artifact@v4 @@ -98,7 +78,6 @@ jobs: name: robosats-desktop-${{ inputs.semver }}-win.zip path: desktopApp/release-builds/desktopApp-win.zip - - name: Create Pre-release id: create_release if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) @@ -111,35 +90,32 @@ jobs: - name: Upload macOS Build Artifact id: upload-release-mac-zip-asset if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/upload-release-asset@v1 + uses: actions/upload-artifact@v4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: /desktopApp-mac.zip - asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-mac.zip - asset_content_type: application/zip + path: /desktopApp-mac.zip + name: robosats-desktop-${{ steps.commit.outputs.short }}-mac.zip - name: Upload Windows Build Artifact id: upload-release-win-zip-asset if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/upload-release-asset@v1 + uses: actions/upload-artifact@v4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: /desktopApp-win.zip - asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-win.zip - asset_content_type: application/zip + path: desktopApp/release-builds/Robosats-win32-ia32 + name: robosats-desktop-${{ steps.commit.outputs.short }}-win32-ia32.zip - name: Upload Linux Build Artifact id: upload-release-linux-zip-asset if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/upload-release-asset@v1 + uses: actions/upload-artifact@v4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: /desktopApp-linux.zip - asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-linux.zip - asset_content_type: application/zip + path: desktopApp/release-builds/Robosats-linux-x64 + name: robosats-desktop-${{ steps.commit.outputs.short }}-linux-x64.zip diff --git a/release_notes.md b/release_notes.md index 6df846085..068ced6f0 100644 --- a/release_notes.md +++ b/release_notes.md @@ -11,15 +11,15 @@ RoboSats v0.7.0 is now out! :rocket: # Android -**[Click to download universal RoboSats APK for Android](https://github.com/RoboSats/robosats/releases/download/vv0.7.0-alpha/robosats-vv0.7.0.alpha-universal.apk)** +**[Click to download universal RoboSats APK for Android](https://github.com/RoboSats/robosats/releases/download/v0.7.0-alpha/robosats-v0.7.0.alpha-universal.apk)** Smaller bundles for each CPU architecture available in the attachments. ### Verify the app using GPG: -1. [Download the ascii armored signature](https://github.com/Reckless-Satoshi/robosats/releases/download/vv0.7.0-alpha/robosats-vv0.7.0.alpha-universal.apk.asc) +1. [Download the ascii armored signature](https://github.com/Reckless-Satoshi/robosats/releases/download/v0.7.0-alpha/robosats-v0.7.0.alpha-universal.apk.asc) 2. Run this command on a directory that contains the apk file and and the ascii armored signature. -`gpg --verify robosats-vv0.7.0.alpha-universal.apk.asc` +`gpg --verify robosats-v0.7.0.alpha-universal.apk.asc` 3. Verify the signer is actually Reckless-Satoshi (fingerprints match): [B4AB5F19113D4125DDF217739C4585B561315571](https://keys.openpgp.org/vks/v1/by-fingerprint/B4AB5F19113D4125DDF217739C4585B561315571) @@ -27,17 +27,17 @@ Alternatively you can also verify with the release with the SHA256 checksum. # Docker Images -[Coordinator Backend Image vv0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats/tags?page=1&name=vv0.7.0-alpha) +[Coordinator Backend Image v0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats/tags?page=1&name=v0.7.0-alpha) ```bash -docker pull recksato/robosats:vv0.7.0-alpha +docker pull recksato/robosats:v0.7.0-alpha ``` -[Client App Image vv0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats-client/tags?page=1&name=vv0.7.0-alpha) +[Client App Image v0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats-client/tags?page=1&name=v0.7.0-alpha) ```bash -docker pull recksato/robosats-client:vv0.7.0-alpha +docker pull recksato/robosats-client:v0.7.0-alpha ``` See [nodeapp/docker-compose.yml](https://github.com/Reckless-Satoshi/robosats/blob/2cd9d748706a8dcc0f03006b483acc6000e0572a/nodeapp/docker-compose.yml) for an example docker-compose usage of the `robosats-client` image.