chore: fix macos release (#1807)

* chore: fix macos release * remove warns from setup node * fix script name * tmp upload mac artifacts manually * add arm64/x64 scripts * change tmp version * change repo/version * add env * bump action version * comment upload artifacts
paritytech · May 23, 2024 · 1d04684 · 1d04684
1 parent 17b6e3b
commit 1d04684
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/.github/workflows/build-release-manual-test.yaml b/.github/workflows/build-release-manual-test.yaml
@@ -21,7 +21,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '18'
-          working-directory: './javascript'
       - run: npm install
         working-directory: "./javascript"
       - run: npm run build
@@ -36,7 +35,12 @@ jobs:
   build_release_for_mac:
     name: build_release_for_mac
     needs: build_release_for_linux
-    runs-on: macos-13 # x64
+    strategy:
+      matrix:
+        target:
+          - { runner: macos-13, arch: x64 }
+          - { runner: macos-14, arch: arm64 }
+    runs-on: ${{ matrix.target.runner }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -46,13 +50,29 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '18'
-          working-directory: './javascript'
       - run: npm install && npm update
         working-directory: "./javascript"
       - run: npm run build
         working-directory: "./javascript"
-      - run: npm run package:macos
+      - run: npm run package:macos:${{ matrix.target.arch }}
         working-directory: "./javascript"
       - name: Test if zombienet-mac runs
-        run: ./bins/zombienet-macos version
-        working-directory: "./javascript"
+        run: ./bins/zombienet-macos-${{ matrix.target.arch }} version
+        working-directory: "./javascript"
+
+      # uncomment to upload the artifacts to the latest release
+      # - name: Gets latest created release info
+      #   id: latest_release_info
+      #   #uses: jossef/action-latest-release-info@v1.2.1
+      #   uses: pepoviola/action-latest-release-info@v0.0.2
+      #   env:
+      #     GITHUB_TOKEN: ${{ github.token }}
+      # - name: upload macos artifact
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ github.token }}
+      #   with:
+      #     upload_url: ${{ steps.latest_release_info.outputs.upload_url }}
+      #     asset_path: ./javascript/bins/zombienet-macos-${{ matrix.target.arch }}
+      #     asset_name: zombienet-macos-${{ matrix.target.arch }}
+      #     asset_content_type: application/octet-stream
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '18'
-          working-directory: './javascript'
       - run: npm install
         working-directory: "./javascript"
       - run: npm run build
@@ -74,7 +73,7 @@ jobs:
     strategy:
       matrix:
         target:
-          - { runner: macos-13, arch: x86_64 }
+          - { runner: macos-13, arch: x64 }
           - { runner: macos-14, arch: arm64 }
     runs-on: ${{ matrix.target.runner }}
     steps:
@@ -86,22 +85,21 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '18'
-          working-directory: './javascript'
       - run: npm install && npm update
         working-directory: "./javascript"
       - run: npm run build
         working-directory: "./javascript"
-      - run: npm run package:macos
+      - run: npm run package:macos:${{ matrix.target.arch }}
         working-directory: "./javascript"
       - name: Test if zombienet-mac runs
-        run: ./bins/zombienet-macos version
+        run: ./bins/zombienet-macos-${{ matrix.target.arch }} version
         working-directory: "./javascript"
       - name: upload macos artifact
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ needs.build_release_for_linux.outputs.upload_url }}
-          asset_path: ./javascript/bins/zombienet-macos
+          asset_path: ./javascript/bins/zombienet-macos-${{ matrix.target.arch }}
           asset_name: zombienet-macos-${{ matrix.target.arch }}
           asset_content_type: application/octet-stream
diff --git a/javascript/package.json b/javascript/package.json
@@ -20,7 +20,8 @@
     "lint:write": "eslint './**' --fix && npx prettier --write .",
     "package": "npm run -w packages/cli package",
     "package:linux": "npm run -w packages/cli package:linux",
-    "package:macos": "npm run -w packages/cli package:macos",
+    "package:macos:x64": "npm run -w packages/cli package:macos:x64",
+    "package:macos:arm64": "npm run -w packages/cli package:macos:arm64",
     "zombie": "node ./packages/cli/dist/cli.js",
     "test": "npm run test --workspaces --if-present",
     "postinstall": "if [[ -f .husky/post-install.js ]]; then cd .. && node javascript/.husky/post-install.js; fi"

diff --git a/javascript/packages/cli/package.json b/javascript/packages/cli/package.json
@@ -11,7 +11,8 @@
     "test": "echo \"Error: no test specified\"",
     "package": "pkg . -o ../../bins/zombienet",
     "package:linux": "pkg . -o ../../bins/zombienet-linux -t node18-linux-x64,node18-linux-arm64",
-    "package:macos": "pkg . -o ../../bins/zombienet-macos -t node18-macos-x64"
+    "package:macos:x64": "pkg . -o ../../bins/zombienet-macos-x64 -t node18-macos-x64",
+    "package:macos:arm64": "pkg . -o ../../bins/zombienet-macos-arm64 -t node18-macos-arm64"
   },
   "repository": {
     "type": "git",
@@ -29,6 +30,7 @@
     ],
     "targets": [
       "node18-macos-x64",
+      "node18-macos-arm64",
       "node18-linux-x64",
       "node18-linux-arm64"
     ]