switch to script to determine target

Author: zawata

.github/workflows/release.yaml

@@ -1,6 +1,10 @@
 name: Build And Release
 
-on: [workflow_dispatch, push]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   Build:
@@ -24,31 +28,22 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
 
-      # linux
-      - name: Install Rust
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          targets: ${{ matrix.arch == 'arm64' && 'aarch64-unknown-linux-gnu' || 'x86_64-unknown-linux-gnu' }}
-
-      # macos
-      - name: Install Rust
-        if: ${{ matrix.os == 'macos-latest' }}
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          targets: ${{ matrix.arch == 'arm64' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}
+      - name: Get Target Name
+        id: get_target
+        env:
+          npm_config_arch: ${{ matrix.arch }}
+        run: |
+          echo "target_name=$(node ./utils/getTarget.js)" >> $GITHUB_ENV
 
-      # windows
       - name: Install Rust
-        if: ${{ matrix.os == 'windows-latest' }}
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          targets: ${{ matrix.arch == 'arm64' && 'aarch64-pc-windows-msvc' || 'x86_64-pc-windows-msvc' }}
+          targets: ${{ steps.get_target.outputs.target_name }}
 
       - name: Building
+        env:
+          npm_config_arch: ${{ matrix.arch }}
         run: pnpm install
 
       - name: Uploading
@@ -68,6 +63,12 @@ jobs:
         with:
           submodules: true
 
+      - name: Update npm
+        run: npm install -g npm@latest
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
@@ -78,8 +79,26 @@ jobs:
           rm -rf bin-*
           sudo chmod -R +x bin
 
+      - name: Verify Binaries
+        run: |
+          // make sure all binaries are present
+          if [ ! -f bin/dump-syms-linux-x64 ]; then echo "Missing bin/dump-syms-linux-x64" && exit 1; fi
+          if [ ! -f bin/dump-syms-linux-arm64 ]; then echo "Missing bin/dump-syms-linux-arm64" && exit 1; fi
+          if [ ! -f bin/dump-syms-macos-x64 ]; then echo "Missing bin/dump-syms-macos-x64" && exit 1; fi
+          if [ ! -f bin/dump-syms-macos-arm64 ]; then echo "Missing bin/dump-syms-macos-arm64" && exit 1; fi
+          if [ ! -f bin/dump-syms-windows-x64.exe ]; then echo "Missing bin/dump-syms-windows-x64.exe" && exit 1; fi
+          if [ ! -f bin/dump-syms-windows-arm64.exe ]; then echo "Missing bin/dump-syms-windows-arm64.exe" && exit 1; fi
+
+      - name: Verify Version
+        run: |
+          TAG_VERSION=${GITHUB_REF#refs/tags/v}
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          if [ "$TAG_VERSION" != "$PACKAGE_VERSION" ]; then
+            echo "Tag version ($TAG_VERSION) does not match package.json version ($PACKAGE_VERSION)"
+            exit 1
+          fi
+
       # this will only publish if the version has been updated
       - name: NPM Publish
-        uses: JS-DevTools/[email protected]
-        with:
-          token: ${{secrets.NPM_TOKEN}}
+        run: |
+          npm publish

build.js

@@ -3,6 +3,7 @@ const path = require('path');
 const { promises: fs, constants } = require('fs');
 const { promisify } = require('util');
 const execFile = promisify(require('child_process').execFile);
+const getTarget = require('./utils/getTarget');
 
 const { spawn, paths, exists } = require('./shared');
 
@@ -15,8 +16,13 @@ const { spawn, paths, exists } = require('./shared');
     await fs.mkdir(paths.bin, { recursive: true });
   }
 
+  // I don't think we can cross-compile platforms easily?
+  const target_arch = process.env.npm_config_arch || process.arch;
+  const target = getTarget(process.platform, target_arch);
+
   await spawn('cargo', [
     'build',
+    `--target=${target}`,
     `--manifest-path=${path.join(paths.submodule, 'Cargo.toml')}`,
     `--target-dir=${paths.build}`,
     '--release'

utils/getTarget.js

@@ -0,0 +1,24 @@
+
+const getTarget = (platform, arch) => {
+  let target = '';
+
+  if (platform === 'linux') {
+    target += arch === 'arm64' ? 'aarch64-unknown-linux-gnu' : 'x86_64-unknown-linux-gnu';
+  } else if (platform === 'darwin') {
+    target += arch === 'arm64' ? 'aarch64-apple-darwin' : 'x86_64-apple-darwin';
+  } else if (platform === 'win32') {
+    target += arch === 'arm64' ? 'aarch64-pc-windows-msvc' : 'x86_64-pc-windows-msvc';
+  } else {
+    throw new Error(`Unsupported platform: ${platform}`);
+  }
+
+  return target;
+};
+
+module.exports = getTarget;
+
+if (require.main === module) {
+  const arch = process.env.npm_config_arch || process.arch;
+  const target = getTarget(process.platform, arch);
+  console.log(target);
+}