fix: failing macos build, wrong arch, missing wallet (#4905)

ChainSafe · Oct 17, 2024 · 0193c4e · 0193c4e
1 parent 8d6c723
commit 0193c4e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
           - os: ubuntu-24.04
             file: forest-${{ github.ref_name }}-linux-amd64.zip
           - os: macos-latest
-            file: forest-${{ github.ref_name }}-macos-amd64.zip
+            file: forest-${{ github.ref_name }}-macos-arm64.zip
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
@@ -27,16 +27,20 @@ jobs:
         uses: Swatinem/rust-cache@v2
         timeout-minutes: 5
         continue-on-error: true
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.work"
       - name: Cargo Build
-        run: cargo build --release --bin forest --bin forest-cli --bin forest-tool
-      - name: Compress Binary
         run: |
-          mkdir -p forest-${{ github.ref_name }}
-          cp -v target/release/forest target/release/forest-cli target/release/forest-tool forest-${{ github.ref_name }}
-          cp -rv CHANGELOG.md LICENSE-APACHE LICENSE-MIT README.md documentation forest-${{ github.ref_name }}
-          sha256sum forest-${{ github.ref_name }}/forest > forest-${{ github.ref_name }}/forest.sha256
-          sha256sum forest-${{ github.ref_name }}/forest-cli > forest-${{ github.ref_name }}/forest-cli.sha256
-          sha256sum forest-${{ github.ref_name }}/forest-tool > forest-${{ github.ref_name }}/forest-tool.sha256
+          mkdir -p release-binaries forest-${{ github.ref_name }}
+          cargo install --locked --path . --force --root release-binaries
+          mv -v release-binaries/bin/* forest-${{ github.ref_name }}
+      - name: Pack artifacts
+        run: |
+          for bin in forest-${{ github.ref_name }}/*; do
+            sha256sum $bin > $bin.sha256
+          done
+          cp -rv CHANGELOG.md LICENSE-APACHE LICENSE-MIT README.md forest-${{ github.ref_name }}
           zip -r ${{ matrix.file }} forest-${{ github.ref_name }}
       - name: Upload Binary
         uses: svenstaro/upload-release-action@v2

diff --git a/.github/workflows/release_dispatch.yml b/.github/workflows/release_dispatch.yml
@@ -19,7 +19,7 @@ jobs:
           - os: ubuntu-24.04
             file: forest-${{ github.event.inputs.tag }}-linux-amd64.zip
           - os: macos-latest
-            file: forest-${{ github.event.inputs.tag }}-macos-amd64.zip
+            file: forest-${{ github.event.inputs.tag }}-macos-arm64.zip
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
@@ -31,16 +31,20 @@ jobs:
         uses: Swatinem/rust-cache@v2
         timeout-minutes: 5
         continue-on-error: true
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.work"
       - name: Cargo Build
-        run: cargo build --release --bin forest --bin forest-cli --bin forest-tool
-      - name: Compress Binary
         run: |
-          mkdir -p forest-${{ github.event.inputs.tag }}
-          cp -v target/release/forest target/release/forest-cli target/release/forest-tool forest-${{ github.event.inputs.tag }}
-          cp -rv CHANGELOG.md LICENSE-APACHE LICENSE-MIT README.md documentation forest-${{ github.event.inputs.tag }}
-          sha256sum forest-${{ github.event.inputs.tag }}/forest > forest-${{ github.event.inputs.tag }}/forest.sha256
-          sha256sum forest-${{ github.event.inputs.tag }}/forest-cli > forest-${{ github.event.inputs.tag }}/forest-cli.sha256
-          sha256sum forest-${{ github.event.inputs.tag }}/forest-tool > forest-${{ github.event.inputs.tag }}/forest-tool.sha256
+          mkdir -p release-binaries forest-${{ github.event.inputs.tag }}
+          cargo install --locked --path . --force --root release-binaries
+          mv -v release-binaries/bin/* forest-${{ github.event.inputs.tag }}
+      - name: Pack artifacts
+        run: |
+          for bin in forest-${{ github.event.inputs.tag }}/*; do
+            sha256sum $bin > $bin.sha256
+          done
+          cp -rv CHANGELOG.md LICENSE-APACHE LICENSE-MIT README.md forest-${{ github.event.inputs.tag }}
           zip -r ${{ matrix.file }} forest-${{ github.event.inputs.tag }}
       - name: Upload Binary
         uses: svenstaro/upload-release-action@v2