From 8db1026a62b65e0b640bf13dbc7cc7e73a806dc8 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 14:29:42 +0200 Subject: [PATCH 01/29] remove rust toolchain --- .github/workflows/reusable_build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml index e3658d1e83..bb1d8906e8 100644 --- a/.github/workflows/reusable_build.yml +++ b/.github/workflows/reusable_build.yml @@ -43,12 +43,6 @@ jobs: with: python-version: '3.10' - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - - name: Install LLVM and Clang (Windows) # required for bindgen to work, see https://github.com/rust-lang/rust-bindgen/issues/1797 uses: KyleMayes/install-llvm-action@v1 if: ${{ inputs.os == 'windows-2022' }} From fec5f9db86f1c3f4c279f43bd0e63593d4d30c3a Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 14:39:38 +0200 Subject: [PATCH 02/29] update setup-python --- .github/workflows/reusable_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml index bb1d8906e8..e25473eaba 100644 --- a/.github/workflows/reusable_build.yml +++ b/.github/workflows/reusable_build.yml @@ -39,7 +39,7 @@ jobs: # Used to read the `binding.gyp` file from `@iota/sdk` - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' From 61cb637fc7d8644b0ab7bce8ab9f4b7905839e40 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 14:58:48 +0200 Subject: [PATCH 03/29] update upload release asset Co-authored-by: Jean Ribeiro --- .github/workflows/reusable_release.yml | 47 +++++++------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index d88ac7badc..f269877a96 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -142,45 +142,22 @@ jobs: asset_name: bloom-desktop-${{ env.VERSION }}.zip asset_content_type: application/octet-stream - - name: Upload Linux updater yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/latest-linux.yml - asset_name: latest-linux.yml - asset_content_type: application/octet-stream - - - name: Upload Windows updater yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/latest.yml - asset_name: latest.yml - asset_content_type: application/octet-stream - - - name: Upload MacOs updater yml - uses: actions/upload-release-asset@v1 + - name: Upload updater yml + run: | + gh release upload $VERSION latest-linux.yml latest.yml latest-mac.yml env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/latest-mac.yml - asset_name: latest-mac.yml - asset_content_type: application/octet-stream + VERSION: ${{ env.VERSION }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: bash - name: Upload Linux code signature asset - uses: actions/upload-release-asset@v1 + run: | + gh release upload $VERSION $ASSET_PATH env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc - asset_name: bloom-desktop-${{ env.VERSION }}.AppImage.asc - asset_content_type: application/pgp-signature + ASSET_PATH: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc + VERSION: ${{ env.VERSION }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: bash - name: Listing artifacts run: ls -al From 3fee5f6999f13993affbf63790a1ed2878530bf3 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:00:27 +0200 Subject: [PATCH 04/29] set version --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 89306abd22..4f36ccb54c 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "1.1.1", + "version": "0.0.16-alpha-1", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 7d7c016044a14cf15bd0725297aa0d80f0e3f5d1 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:07:56 +0200 Subject: [PATCH 05/29] comment out win + mac --- .github/workflows/build-and-release.yml | 2 +- .github/workflows/reusable_release.yml | 110 +++++++++++------------- 2 files changed, 52 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 719953d7da..38a37734fe 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -54,7 +54,7 @@ jobs: needs: [setup] strategy: matrix: - os: [ubuntu-20.04, windows-2022, macos-12] + os: [ubuntu-20.04] fail-fast: true with: os: ${{ matrix.os }} diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index f269877a96..7c76527797 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Downloading artifacts (Windows) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-windows-2022 - path: assets - - - name: Downloading artifacts (macOS) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-macos-12 - path: assets + # - name: Downloading artifacts (Windows) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-windows-2022 + # path: assets + + # - name: Downloading artifacts (macOS) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-macos-12 + # path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -49,12 +49,8 @@ jobs: - name: Preparing release body run: | sed -i 's/\r$//' ../../assets/*.sha256 && sed -i '/^$/d' ../../assets/*.sha256 && sed -i -e 's/\(.*\)/\L\1/' ../../assets/*.sha256 - WIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.sha256) - WIN_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap.sha256) LIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.AppImage.sha256) - MAC_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.sha256) - MAC_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap.sha256) - echo $WIN_SHA256 $LIN_SHA256 $MAC_SHA256 + echo $LIN_SHA256 touch CHANGELOG.md echo '### Changelog' >> CHANGELOG.md echo '------' >> CHANGELOG.md @@ -62,11 +58,7 @@ jobs: echo '[How to verify the authenticity of your Bloom Desktop download](https://wiki.iota.org/shimmer/introduction/how_tos/verify_download/#verify-your-firefly-desktop-download)' >> CHANGELOG.md echo '| File | Platform | SHA256 Hash |' >> CHANGELOG.md echo '| --- | --- | --- |' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.exe | Windows |' $WIN_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.exe.blockmap | Windows |' $WIN_BLOCKMAP_SHA256 '|' >> CHANGELOG.md echo '| bloom-desktop-${{ env.VERSION }}.AppImage | Linux |' $LIN_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.dmg | MacOS |' $MAC_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.dmg.blockmap | MacOS |' $MAC_BLOCKMAP_SHA256 '|' >> CHANGELOG.md cat CHANGELOG.md working-directory: packages/desktop @@ -82,45 +74,45 @@ jobs: draft: true prerelease: true - - name: Upload macOS binary asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg - asset_name: bloom-desktop-${{ env.VERSION }}.dmg - asset_content_type: application/octet-stream - - - name: Upload macOS blockmap - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - asset_name: bloom-desktop-${{ env.VERSION }}.dmg.blockmap - asset_content_type: application/octet-stream - - - name: Upload Windows binary asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe - asset_name: bloom-desktop-${{ env.VERSION }}.exe - asset_content_type: application/octet-stream - - - name: Upload Windows blockmap - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - asset_name: bloom-desktop-${{ env.VERSION }}.exe.blockmap - asset_content_type: application/octet-stream + # - name: Upload macOS binary asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg + # asset_name: bloom-desktop-${{ env.VERSION }}.dmg + # asset_content_type: application/octet-stream + + # - name: Upload macOS blockmap + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap + # asset_name: bloom-desktop-${{ env.VERSION }}.dmg.blockmap + # asset_content_type: application/octet-stream + + # - name: Upload Windows binary asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe + # asset_name: bloom-desktop-${{ env.VERSION }}.exe + # asset_content_type: application/octet-stream + + # - name: Upload Windows blockmap + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap + # asset_name: bloom-desktop-${{ env.VERSION }}.exe.blockmap + # asset_content_type: application/octet-stream - name: Upload Linux binary asset uses: actions/upload-release-asset@v1 From f89fe4743d89d8e501b63ed5b1e86b2b5f0c6767 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:09:08 +0200 Subject: [PATCH 06/29] incr version --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 4f36ccb54c..4316e7393d 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-1", + "version": "0.0.16-alpha-2", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 35390c79a8437694732f982bdba3f556ac287a94 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:18:51 +0200 Subject: [PATCH 07/29] remove mac code --- .github/workflows/reusable_release.yml | 18 +++++++++--------- packages/desktop/package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 7c76527797..ee167d4383 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -124,15 +124,15 @@ jobs: asset_name: bloom-desktop-${{ env.VERSION }}.AppImage asset_content_type: application/octet-stream - - name: Upload zip asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.zip - asset_name: bloom-desktop-${{ env.VERSION }}.zip - asset_content_type: application/octet-stream + # - name: Upload zip asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: assets/bloom-desktop-${{ env.VERSION }}.zip + # asset_name: bloom-desktop-${{ env.VERSION }}.zip + # asset_content_type: application/octet-stream - name: Upload updater yml run: | diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 4316e7393d..f3209ca4cc 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-2", + "version": "0.0.16-alpha-3", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 92e351cbacb378b539d8901e78825ce94dfdc51a Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:26:35 +0200 Subject: [PATCH 08/29] fix updater file --- .github/workflows/reusable_release.yml | 2 +- packages/desktop/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index ee167d4383..79d93e5825 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -136,7 +136,7 @@ jobs: - name: Upload updater yml run: | - gh release upload $VERSION latest-linux.yml latest.yml latest-mac.yml + gh release upload $VERSION assets/latest-linux.yml env: VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index f3209ca4cc..5a49d49786 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-3", + "version": "0.0.16-alpha-4", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 8f49b98a84ccbc20d4dbc78531e9262f65bc05e5 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:32:42 +0200 Subject: [PATCH 09/29] clobber --- .github/workflows/reusable_release.yml | 2 +- packages/desktop/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 79d93e5825..680c036c5f 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -136,7 +136,7 @@ jobs: - name: Upload updater yml run: | - gh release upload $VERSION assets/latest-linux.yml + gh release upload $VERSION assets/latest-linux.yml --clobber env: VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 5a49d49786..963bd3091c 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-4", + "version": "0.0.16-alpha-5", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 5d634f3c74cee8039ebfb7d1414d5dc02f00d708 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:47:50 +0200 Subject: [PATCH 10/29] cleanup uploading to release --- .github/workflows/reusable_release.yml | 109 ++++++++----------------- 1 file changed, 33 insertions(+), 76 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 680c036c5f..b362105a8c 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - # - name: Downloading artifacts (Windows) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-windows-2022 - # path: assets + - name: Downloading artifacts (Windows) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-windows-2022 + path: assets - # - name: Downloading artifacts (macOS) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-macos-12 - # path: assets + - name: Downloading artifacts (macOS) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-macos-12 + path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -73,82 +73,39 @@ jobs: body_path: packages/desktop/CHANGELOG.md draft: true prerelease: true - - # - name: Upload macOS binary asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg - # asset_name: bloom-desktop-${{ env.VERSION }}.dmg - # asset_content_type: application/octet-stream - - # - name: Upload macOS blockmap - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - # asset_name: bloom-desktop-${{ env.VERSION }}.dmg.blockmap - # asset_content_type: application/octet-stream - - # - name: Upload Windows binary asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe - # asset_name: bloom-desktop-${{ env.VERSION }}.exe - # asset_content_type: application/octet-stream - - # - name: Upload Windows blockmap - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - # asset_name: bloom-desktop-${{ env.VERSION }}.exe.blockmap - # asset_content_type: application/octet-stream - - - name: Upload Linux binary asset - uses: actions/upload-release-asset@v1 + + - name: Upload Linux assets + run: | + gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: assets/bloom-desktop-${{ env.VERSION }}.AppImage - asset_name: bloom-desktop-${{ env.VERSION }}.AppImage - asset_content_type: application/octet-stream - - # - name: Upload zip asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: assets/bloom-desktop-${{ env.VERSION }}.zip - # asset_name: bloom-desktop-${{ env.VERSION }}.zip - # asset_content_type: application/octet-stream - - - name: Upload updater yml + VERSION: ${{ env.VERSION }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BINARY: assets/bloom-desktop-${{ env.VERSION }}.AppImage + SIGNATURE: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc + UPDATER: assets/latest-linux.yml + shell: bash + + - name: Upload Mac assets run: | - gh release upload $VERSION assets/latest-linux.yml --clobber + gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber env: VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap + BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg + ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip + UPDATER: assets/latest-mac.yml shell: bash - - - name: Upload Linux code signature asset + + - name: Upload Windows assets run: | - gh release upload $VERSION $ASSET_PATH + gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber env: - ASSET_PATH: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe + BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap + UPDATER: assets/latest.yml shell: bash - name: Listing artifacts From 3f8ec3a1b557dec29ce12516dae9d04126b45ec9 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:48:32 +0200 Subject: [PATCH 11/29] test linux --- .github/workflows/reusable_release.yml | 62 +++++++++++++------------- packages/desktop/package.json | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index b362105a8c..03ef44717b 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Downloading artifacts (Windows) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-windows-2022 - path: assets + # - name: Downloading artifacts (Windows) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-windows-2022 + # path: assets - - name: Downloading artifacts (macOS) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-macos-12 - path: assets + # - name: Downloading artifacts (macOS) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-macos-12 + # path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -85,28 +85,28 @@ jobs: UPDATER: assets/latest-linux.yml shell: bash - - name: Upload Mac assets - run: | - gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber - env: - VERSION: ${{ env.VERSION }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg - ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip - UPDATER: assets/latest-mac.yml - shell: bash + # - name: Upload Mac assets + # run: | + # gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber + # env: + # VERSION: ${{ env.VERSION }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap + # BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg + # ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip + # UPDATER: assets/latest-mac.yml + # shell: bash - - name: Upload Windows assets - run: | - gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber - env: - VERSION: ${{ env.VERSION }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe - BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - UPDATER: assets/latest.yml - shell: bash + # - name: Upload Windows assets + # run: | + # gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber + # env: + # VERSION: ${{ env.VERSION }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe + # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap + # UPDATER: assets/latest.yml + # shell: bash - name: Listing artifacts run: ls -al diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 963bd3091c..bbff98cb11 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-5", + "version": "0.0.16-alpha-6", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 15224de7f38fcfb358e6bbcc64de46df12f0442e Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:56:34 +0200 Subject: [PATCH 12/29] uncomment all OS --- .github/workflows/build-and-release.yml | 2 +- .github/workflows/reusable_release.yml | 64 ++++++++++++------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 38a37734fe..719953d7da 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -54,7 +54,7 @@ jobs: needs: [setup] strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-20.04, windows-2022, macos-12] fail-fast: true with: os: ${{ matrix.os }} diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 03ef44717b..e1ad792e69 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - # - name: Downloading artifacts (Windows) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-windows-2022 - # path: assets + - name: Downloading artifacts (Windows) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-windows-2022 + path: assets - # - name: Downloading artifacts (macOS) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-macos-12 - # path: assets + - name: Downloading artifacts (macOS) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-macos-12 + path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -76,7 +76,7 @@ jobs: - name: Upload Linux assets run: | - gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber + gh release upload $VERSION $BINARY $UPDATER $SIGNATURE --clobber env: VERSION: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -85,28 +85,28 @@ jobs: UPDATER: assets/latest-linux.yml shell: bash - # - name: Upload Mac assets - # run: | - # gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber - # env: - # VERSION: ${{ env.VERSION }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - # BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg - # ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip - # UPDATER: assets/latest-mac.yml - # shell: bash + - name: Upload Mac assets + run: | + gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber + env: + VERSION: ${{ env.VERSION }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap + BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg + ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip + UPDATER: assets/latest-mac.yml + shell: bash - # - name: Upload Windows assets - # run: | - # gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber - # env: - # VERSION: ${{ env.VERSION }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe - # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - # UPDATER: assets/latest.yml - # shell: bash + - name: Upload Windows assets + run: | + gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber + env: + VERSION: ${{ env.VERSION }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe + BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap + UPDATER: assets/latest.yml + shell: bash - name: Listing artifacts run: ls -al From bc3039e36d07c3df52af0324ef59ab788dd06f08 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 15:57:39 +0200 Subject: [PATCH 13/29] incr version --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index bbff98cb11..442a082d45 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-6", + "version": "0.0.16-alpha-7", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 8fa2248b329f3fe2f47aa28c38ae64075cac817c Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 16:26:25 +0200 Subject: [PATCH 14/29] change release name --- .github/workflows/reusable_release.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index e1ad792e69..c8a47a8219 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -49,8 +49,12 @@ jobs: - name: Preparing release body run: | sed -i 's/\r$//' ../../assets/*.sha256 && sed -i '/^$/d' ../../assets/*.sha256 && sed -i -e 's/\(.*\)/\L\1/' ../../assets/*.sha256 + WIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.sha256) + WIN_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap.sha256) LIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.AppImage.sha256) - echo $LIN_SHA256 + MAC_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.sha256) + MAC_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap.sha256) + echo $WIN_SHA256 $LIN_SHA256 $MAC_SHA256 touch CHANGELOG.md echo '### Changelog' >> CHANGELOG.md echo '------' >> CHANGELOG.md @@ -58,7 +62,11 @@ jobs: echo '[How to verify the authenticity of your Bloom Desktop download](https://wiki.iota.org/shimmer/introduction/how_tos/verify_download/#verify-your-firefly-desktop-download)' >> CHANGELOG.md echo '| File | Platform | SHA256 Hash |' >> CHANGELOG.md echo '| --- | --- | --- |' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.exe | Windows |' $WIN_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.exe.blockmap | Windows |' $WIN_BLOCKMAP_SHA256 '|' >> CHANGELOG.md echo '| bloom-desktop-${{ env.VERSION }}.AppImage | Linux |' $LIN_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.dmg | MacOS |' $MAC_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.dmg.blockmap | MacOS |' $MAC_BLOCKMAP_SHA256 '|' >> CHANGELOG.md cat CHANGELOG.md working-directory: packages/desktop @@ -76,9 +84,9 @@ jobs: - name: Upload Linux assets run: | - gh release upload $VERSION $BINARY $UPDATER $SIGNATURE --clobber + gh release upload $RELEASE_NAME $BINARY $UPDATER $SIGNATURE --clobber env: - VERSION: ${{ env.VERSION }} + RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BINARY: assets/bloom-desktop-${{ env.VERSION }}.AppImage SIGNATURE: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc @@ -87,9 +95,9 @@ jobs: - name: Upload Mac assets run: | - gh release upload $VERSION $BLOCKMAP $BINARY $ZIP $UPDATER --clobber + gh release upload $RELEASE_NAME $BLOCKMAP $BINARY $ZIP $UPDATER --clobber env: - VERSION: ${{ env.VERSION }} + RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg @@ -99,9 +107,9 @@ jobs: - name: Upload Windows assets run: | - gh release upload $VERSION $BINARY $BLOCKMAP $UPDATER --clobber + gh release upload $RELEASE_NAME $BINARY $BLOCKMAP $UPDATER --clobber env: - VERSION: ${{ env.VERSION }} + RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap From 344361ec0984f9623878fade895c6d0207287321 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 16:26:43 +0200 Subject: [PATCH 15/29] incr version --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 442a082d45..57ef8dd5a4 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-7", + "version": "0.0.16-alpha-8", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 7e1b6f61de76ca75c81a380db584d97c3b2ad2f2 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 09:22:40 +0200 Subject: [PATCH 16/29] use github script --- .github/workflows/reusable_release.yml | 62 +++++++++++++++++--------- packages/desktop/package.json | 2 +- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index c8a47a8219..030baa8e96 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -93,28 +93,48 @@ jobs: UPDATER: assets/latest-linux.yml shell: bash - - name: Upload Mac assets - run: | - gh release upload $RELEASE_NAME $BLOCKMAP $BINARY $ZIP $UPDATER --clobber - env: - RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg - ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip - UPDATER: assets/latest-mac.yml - shell: bash + # - name: Upload Mac assets + # run: | + # gh release upload $RELEASE_NAME $BLOCKMAP $BINARY $ZIP $UPDATER --clobber + # env: + # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap + # BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg + # ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip + # UPDATER: assets/latest-mac.yml + # shell: bash - - name: Upload Windows assets - run: | - gh release upload $RELEASE_NAME $BINARY $BLOCKMAP $UPDATER --clobber - env: - RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe - BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - UPDATER: assets/latest.yml - shell: bash + # - name: Upload Windows assets + # run: | + # gh release upload $RELEASE_NAME $BINARY $BLOCKMAP $UPDATER --clobber + # env: + # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe + # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap + # UPDATER: assets/latest.yml + # shell: bash + + - name: Upload Linux assets + uses: "actions/github-script@v6" + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + script: | + const fs = require('fs'); + const files = [ + 'bloom-desktop-${{ env.VERSION }}.AppImage' + 'bloom-desktop-${{ env.VERSION }}.AppImage.asc' + 'latest-linux.yml' + ] + for (const file of files) { + await github.rest.repos.uploadReleaseAsset({ + url: ${{ steps.create_release.outputs.upload_url }}, + name: file, + file: fs.readFileSync('asset/' + file). + }); + } + - name: Listing artifacts run: ls -al diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 57ef8dd5a4..88648bf622 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-8", + "version": "0.0.16-alpha-9", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 6b646c5391152eadeb185cb9e2820ea9987c3ca5 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 10:28:58 +0200 Subject: [PATCH 17/29] remoe old linux code --- .github/workflows/reusable_release.yml | 20 ++++++++++---------- packages/desktop/package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 030baa8e96..f3752fda72 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -82,16 +82,16 @@ jobs: draft: true prerelease: true - - name: Upload Linux assets - run: | - gh release upload $RELEASE_NAME $BINARY $UPDATER $SIGNATURE --clobber - env: - RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BINARY: assets/bloom-desktop-${{ env.VERSION }}.AppImage - SIGNATURE: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc - UPDATER: assets/latest-linux.yml - shell: bash + # - name: Upload Linux assets + # run: | + # gh release upload $RELEASE_NAME $BINARY $UPDATER $SIGNATURE --clobber + # env: + # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BINARY: assets/bloom-desktop-${{ env.VERSION }}.AppImage + # SIGNATURE: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc + # UPDATER: assets/latest-linux.yml + # shell: bash # - name: Upload Mac assets # run: | diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 88648bf622..29aa34b638 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-9", + "version": "0.0.16-alpha-10", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 262bd7dddd2bfe1060e22eb13256a37117ca0018 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 11:03:43 +0200 Subject: [PATCH 18/29] fix github script --- .github/workflows/reusable_release.yml | 4 ++-- packages/desktop/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index f3752fda72..2a96a0882c 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -123,8 +123,8 @@ jobs: script: | const fs = require('fs'); const files = [ - 'bloom-desktop-${{ env.VERSION }}.AppImage' - 'bloom-desktop-${{ env.VERSION }}.AppImage.asc' + 'bloom-desktop-${{ env.VERSION }}.AppImage', + 'bloom-desktop-${{ env.VERSION }}.AppImage.asc', 'latest-linux.yml' ] for (const file of files) { diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 29aa34b638..9ee71cc8eb 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-10", + "version": "0.0.16-alpha-11", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 5d2fc2ce2b70e954f50856671cf6da11d0c8d989 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 11:20:44 +0200 Subject: [PATCH 19/29] fix github script --- .github/workflows/reusable_release.yml | 2 +- packages/desktop/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 2a96a0882c..1fdde60fd8 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -131,7 +131,7 @@ jobs: await github.rest.repos.uploadReleaseAsset({ url: ${{ steps.create_release.outputs.upload_url }}, name: file, - file: fs.readFileSync('asset/' + file). + file: fs.readFileSync('asset/' + file) }); } diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 9ee71cc8eb..ebff9028e3 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-11", + "version": "0.0.16-alpha-12", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From d0e616086b49f83813e210542fa06748fe46cf8c Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 11:57:06 +0200 Subject: [PATCH 20/29] create release script --- .github/workflows/reusable_release.yml | 77 ++++++++++++++++++++------ packages/desktop/package.json | 2 +- 2 files changed, 62 insertions(+), 17 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 1fdde60fd8..1462b34a83 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -70,17 +70,17 @@ jobs: cat CHANGELOG.md working-directory: packages/desktop - - name: Create Release - id: create_release - uses: actions/create-release@v1.1.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Bloom Desktop ${{ env.RELEASE_NAME }} - body_path: packages/desktop/CHANGELOG.md - draft: true - prerelease: true + # - name: Create Release + # id: create_release + # uses: actions/create-release@v1.1.2 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: ${{ github.ref }} + # release_name: Bloom Desktop ${{ env.RELEASE_NAME }} + # body_path: packages/desktop/CHANGELOG.md + # draft: true + # prerelease: true # - name: Upload Linux assets # run: | @@ -116,25 +116,70 @@ jobs: # UPDATER: assets/latest.yml # shell: bash + - name: Create Release + uses: "actions/github-script@v6" + id: create_release + env: + TAG: ${{ github.ref }} + RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} + BODY_PATH: packages/desktop/CHANGELOG.md + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + result-encoding: string + script: | + const fs = require('fs'); + + const { TAG, RELEASE_NAME, BODY_PATH } = process.env; + const tag = TAG.replace('refs/tags/', ''); + const releaseName = RELEASE_NAME.replace('refs/tags/', ''); + + const bodyPath = BODY_PATH; + let bodyFileContent = null; + if (bodyPath !== '' && !!bodyPath) { + try { + bodyFileContent = fs.readFileSync(bodyPath, { encoding: 'utf8' }); + } catch (error) { + core.setFailed(error.message); + } + } + + const createReleaseResponse = await github.repos.createRelease({ + tag_name: tag, + name: releaseName, + body: bodyFileContent, + draft: true, + prerelease: true, + owner: context.repo.owner, + repo: context.repo.repo, + target_commitish: context.sha + }); + + return createReleaseResponse.upload_url; + - name: Upload Linux assets uses: "actions/github-script@v6" + env: + VERSION: ${{ env.VERSION }} + UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }} with: github-token: "${{ secrets.GITHUB_TOKEN }}" script: | const fs = require('fs'); + + const { VERSION, UPLOAD_URL } = process.env; const files = [ - 'bloom-desktop-${{ env.VERSION }}.AppImage', - 'bloom-desktop-${{ env.VERSION }}.AppImage.asc', + `bloom-desktop-${VERSION}.AppImage`, + `bloom-desktop-${VERSION}.AppImage.asc`, 'latest-linux.yml' ] for (const file of files) { await github.rest.repos.uploadReleaseAsset({ - url: ${{ steps.create_release.outputs.upload_url }}, + url: UPLOAD_URL, name: file, file: fs.readFileSync('asset/' + file) }); } - - + + - name: Listing artifacts run: ls -al diff --git a/packages/desktop/package.json b/packages/desktop/package.json index ebff9028e3..1dc0ea9e21 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-12", + "version": "0.0.16-alpha-13", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From db57bf0bdcfb45d2d85b6dd614117f4272861978 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 12:10:15 +0200 Subject: [PATCH 21/29] fix --- .github/workflows/reusable_release.yml | 30 ++++++++++---------------- packages/desktop/package.json | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 1462b34a83..ec13bdb509 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Downloading artifacts (Windows) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-windows-2022 - path: assets + # - name: Downloading artifacts (Windows) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-windows-2022 + # path: assets - - name: Downloading artifacts (macOS) - uses: actions/download-artifact@v4 - with: - name: bloom-desktop-macos-12 - path: assets + # - name: Downloading artifacts (macOS) + # uses: actions/download-artifact@v4 + # with: + # name: bloom-desktop-macos-12 + # path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -49,11 +49,7 @@ jobs: - name: Preparing release body run: | sed -i 's/\r$//' ../../assets/*.sha256 && sed -i '/^$/d' ../../assets/*.sha256 && sed -i -e 's/\(.*\)/\L\1/' ../../assets/*.sha256 - WIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.sha256) - WIN_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap.sha256) LIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.AppImage.sha256) - MAC_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.sha256) - MAC_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap.sha256) echo $WIN_SHA256 $LIN_SHA256 $MAC_SHA256 touch CHANGELOG.md echo '### Changelog' >> CHANGELOG.md @@ -62,11 +58,7 @@ jobs: echo '[How to verify the authenticity of your Bloom Desktop download](https://wiki.iota.org/shimmer/introduction/how_tos/verify_download/#verify-your-firefly-desktop-download)' >> CHANGELOG.md echo '| File | Platform | SHA256 Hash |' >> CHANGELOG.md echo '| --- | --- | --- |' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.exe | Windows |' $WIN_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.exe.blockmap | Windows |' $WIN_BLOCKMAP_SHA256 '|' >> CHANGELOG.md echo '| bloom-desktop-${{ env.VERSION }}.AppImage | Linux |' $LIN_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.dmg | MacOS |' $MAC_SHA256 '|' >> CHANGELOG.md - echo '| bloom-desktop-${{ env.VERSION }}.dmg.blockmap | MacOS |' $MAC_BLOCKMAP_SHA256 '|' >> CHANGELOG.md cat CHANGELOG.md working-directory: packages/desktop @@ -143,7 +135,7 @@ jobs: } } - const createReleaseResponse = await github.repos.createRelease({ + const createReleaseResponse = await github.rest.repos.createRelease({ tag_name: tag, name: releaseName, body: bodyFileContent, diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 1dc0ea9e21..f8d204cdf6 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-13", + "version": "0.0.16-alpha-14", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 328332ab291cf4d5a0288ad09feb1d05952f60a9 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 12:24:26 +0200 Subject: [PATCH 22/29] fix typo --- .github/workflows/build-and-release.yml | 2 +- .github/workflows/reusable_release.yml | 2 +- packages/desktop/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 719953d7da..38a37734fe 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -54,7 +54,7 @@ jobs: needs: [setup] strategy: matrix: - os: [ubuntu-20.04, windows-2022, macos-12] + os: [ubuntu-20.04] fail-fast: true with: os: ${{ matrix.os }} diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index ec13bdb509..4705ba3dd2 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -168,7 +168,7 @@ jobs: await github.rest.repos.uploadReleaseAsset({ url: UPLOAD_URL, name: file, - file: fs.readFileSync('asset/' + file) + file: fs.readFileSync('assets/' + file) }); } diff --git a/packages/desktop/package.json b/packages/desktop/package.json index f8d204cdf6..64619903e4 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-14", + "version": "0.0.16-alpha-15", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 32fa7d04f986fbd4a082486a14d353a5fdbcaae2 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 12:47:05 +0200 Subject: [PATCH 23/29] test --- .github/workflows/reusable_release.yml | 4 ++-- packages/desktop/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 4705ba3dd2..82da626fb0 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -156,7 +156,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" script: | - const fs = require('fs'); + const fs = require('fs').promises; const { VERSION, UPLOAD_URL } = process.env; const files = [ @@ -168,7 +168,7 @@ jobs: await github.rest.repos.uploadReleaseAsset({ url: UPLOAD_URL, name: file, - file: fs.readFileSync('assets/' + file) + data: await fs.readFile('assets/' + file) }); } diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 64619903e4..49d49e2a50 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-15", + "version": "0.0.16-alpha-16", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From a00feb7117f64dc8bd3e878a4d1473bd5f0fc961 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 13:03:28 +0200 Subject: [PATCH 24/29] fix upload url --- .github/workflows/reusable_release.yml | 2 +- packages/desktop/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 82da626fb0..b4d3692fe9 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -152,7 +152,7 @@ jobs: uses: "actions/github-script@v6" env: VERSION: ${{ env.VERSION }} - UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }} + UPLOAD_URL: ${{ steps.create_release.outputs.result }} with: github-token: "${{ secrets.GITHUB_TOKEN }}" script: | diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 49d49e2a50..a329dee4ad 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-16", + "version": "0.0.16-alpha-17", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From c4f6070897894d2edebe780463473495be40bfea Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 13:21:04 +0200 Subject: [PATCH 25/29] log upload path --- .github/workflows/reusable_release.yml | 8 ++++++-- packages/desktop/package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index b4d3692fe9..ba3eaa9bc7 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -109,7 +109,7 @@ jobs: # shell: bash - name: Create Release - uses: "actions/github-script@v6" + uses: "actions/github-script@v7" id: create_release env: TAG: ${{ github.ref }} @@ -148,8 +148,12 @@ jobs: return createReleaseResponse.upload_url; + + - name: OUTPUT + run: echo "${{ steps.create_release.outputs.result }}" + - name: Upload Linux assets - uses: "actions/github-script@v6" + uses: "actions/github-script@v7" env: VERSION: ${{ env.VERSION }} UPLOAD_URL: ${{ steps.create_release.outputs.result }} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index a329dee4ad..a98274f3a0 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-17", + "version": "0.0.16-alpha-18", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 3e7456c1b6c57f9adca256de26bf8a8e5502f201 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 13:28:56 +0200 Subject: [PATCH 26/29] test --- .github/workflows/reusable_release.yml | 4 ++-- packages/desktop/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index ba3eaa9bc7..aafc1cf3f5 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -146,11 +146,11 @@ jobs: target_commitish: context.sha }); - return createReleaseResponse.upload_url; + return JSON.stringify(createReleaseResponse); - name: OUTPUT - run: echo "${{ steps.create_release.outputs.result }}" + run: echo "${{ steps.create_release.outputs }}" - name: Upload Linux assets uses: "actions/github-script@v7" diff --git a/packages/desktop/package.json b/packages/desktop/package.json index a98274f3a0..72b2aeb3dd 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-18", + "version": "0.0.16-alpha-19", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 24cca6e8912d63feb116763d6d98ca320bfa5324 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 13:43:47 +0200 Subject: [PATCH 27/29] fix return value --- .github/workflows/reusable_release.yml | 4 ++-- packages/desktop/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index aafc1cf3f5..d2ee94ed01 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -146,11 +146,11 @@ jobs: target_commitish: context.sha }); - return JSON.stringify(createReleaseResponse); + return createReleaseResponse.data.upload_url; - name: OUTPUT - run: echo "${{ steps.create_release.outputs }}" + run: echo "${{ steps.create_release.outputs.result }}" - name: Upload Linux assets uses: "actions/github-script@v7" diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 72b2aeb3dd..411528d89d 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-19", + "version": "0.0.16-alpha-20", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 69fd47a38db4fc1ddc9e9c5903bb9a2d5d772641 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 14:00:10 +0200 Subject: [PATCH 28/29] revert old changes --- .github/workflows/build-and-release.yml | 2 +- .github/workflows/reusable_release.yml | 125 +++++++++++++----------- packages/desktop/package.json | 2 +- 3 files changed, 69 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 38a37734fe..719953d7da 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -54,7 +54,7 @@ jobs: needs: [setup] strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-20.04, windows-2022, macos-12] fail-fast: true with: os: ${{ matrix.os }} diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index d2ee94ed01..8a950fefcd 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -28,17 +28,17 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - # - name: Downloading artifacts (Windows) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-windows-2022 - # path: assets + - name: Downloading artifacts (Windows) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-windows-2022 + path: assets - # - name: Downloading artifacts (macOS) - # uses: actions/download-artifact@v4 - # with: - # name: bloom-desktop-macos-12 - # path: assets + - name: Downloading artifacts (macOS) + uses: actions/download-artifact@v4 + with: + name: bloom-desktop-macos-12 + path: assets - name: Downloading artifacts (Linux) uses: actions/download-artifact@v4 @@ -49,7 +49,11 @@ jobs: - name: Preparing release body run: | sed -i 's/\r$//' ../../assets/*.sha256 && sed -i '/^$/d' ../../assets/*.sha256 && sed -i -e 's/\(.*\)/\L\1/' ../../assets/*.sha256 + WIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.sha256) + WIN_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap.sha256) LIN_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.AppImage.sha256) + MAC_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.sha256) + MAC_BLOCKMAP_SHA256=$(cat ../../assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap.sha256) echo $WIN_SHA256 $LIN_SHA256 $MAC_SHA256 touch CHANGELOG.md echo '### Changelog' >> CHANGELOG.md @@ -58,56 +62,14 @@ jobs: echo '[How to verify the authenticity of your Bloom Desktop download](https://wiki.iota.org/shimmer/introduction/how_tos/verify_download/#verify-your-firefly-desktop-download)' >> CHANGELOG.md echo '| File | Platform | SHA256 Hash |' >> CHANGELOG.md echo '| --- | --- | --- |' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.exe | Windows |' $WIN_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.exe.blockmap | Windows |' $WIN_BLOCKMAP_SHA256 '|' >> CHANGELOG.md echo '| bloom-desktop-${{ env.VERSION }}.AppImage | Linux |' $LIN_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.dmg | MacOS |' $MAC_SHA256 '|' >> CHANGELOG.md + echo '| bloom-desktop-${{ env.VERSION }}.dmg.blockmap | MacOS |' $MAC_BLOCKMAP_SHA256 '|' >> CHANGELOG.md cat CHANGELOG.md working-directory: packages/desktop - # - name: Create Release - # id: create_release - # uses: actions/create-release@v1.1.2 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.ref }} - # release_name: Bloom Desktop ${{ env.RELEASE_NAME }} - # body_path: packages/desktop/CHANGELOG.md - # draft: true - # prerelease: true - - # - name: Upload Linux assets - # run: | - # gh release upload $RELEASE_NAME $BINARY $UPDATER $SIGNATURE --clobber - # env: - # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # BINARY: assets/bloom-desktop-${{ env.VERSION }}.AppImage - # SIGNATURE: assets/bloom-desktop-${{ env.VERSION }}.AppImage.asc - # UPDATER: assets/latest-linux.yml - # shell: bash - - # - name: Upload Mac assets - # run: | - # gh release upload $RELEASE_NAME $BLOCKMAP $BINARY $ZIP $UPDATER --clobber - # env: - # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.dmg.blockmap - # BINARY: assets/bloom-desktop-${{ env.VERSION }}.dmg - # ZIP: assets/bloom-desktop-${{ env.VERSION }}.zip - # UPDATER: assets/latest-mac.yml - # shell: bash - - # - name: Upload Windows assets - # run: | - # gh release upload $RELEASE_NAME $BINARY $BLOCKMAP $UPDATER --clobber - # env: - # RELEASE_NAME: Bloom Desktop ${{ env.RELEASE_NAME }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # BINARY: assets/bloom-desktop-${{ env.VERSION }}.exe - # BLOCKMAP: assets/bloom-desktop-${{ env.VERSION }}.exe.blockmap - # UPDATER: assets/latest.yml - # shell: bash - - name: Create Release uses: "actions/github-script@v7" id: create_release @@ -148,9 +110,56 @@ jobs: return createReleaseResponse.data.upload_url; + - name: Upload Windows assets + uses: "actions/github-script@v7" + env: + VERSION: ${{ env.VERSION }} + UPLOAD_URL: ${{ steps.create_release.outputs.result }} + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + script: | + const fs = require('fs').promises; + + const { VERSION, UPLOAD_URL } = process.env; + const files = [ + `bloom-desktop-${VERSION}.exe`, + `bloom-desktop-${VERSION}.exe.blockmap`, + 'latest.yml' + ] + for (const file of files) { + await github.rest.repos.uploadReleaseAsset({ + url: UPLOAD_URL, + name: file, + data: await fs.readFile('assets/' + file) + }); + } + + + - name: Upload Mac assets + uses: "actions/github-script@v7" + env: + VERSION: ${{ env.VERSION }} + UPLOAD_URL: ${{ steps.create_release.outputs.result }} + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + script: | + const fs = require('fs').promises; + + const { VERSION, UPLOAD_URL } = process.env; + const files = [ + `bloom-desktop-${VERSION}.dmg`, + `bloom-desktop-${VERSION}.dmg.blockmap`, + `bloom-desktop-${VERSION}.zip`, + 'latest-mac.yml' + ] + for (const file of files) { + await github.rest.repos.uploadReleaseAsset({ + url: UPLOAD_URL, + name: file, + data: await fs.readFile('assets/' + file) + }); + } - - name: OUTPUT - run: echo "${{ steps.create_release.outputs.result }}" - name: Upload Linux assets uses: "actions/github-script@v7" diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 411528d89d..80cfec5f27 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-20", + "version": "0.0.16-alpha-21", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", From 1bcc1347f0359ba03571464127347ac15ead77ca Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 3 Jul 2024 14:57:23 +0200 Subject: [PATCH 29/29] revert version --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 80cfec5f27..89306abd22 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "0.0.16-alpha-21", + "version": "1.1.1", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git",