diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae770422..11be5188 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,12 +18,16 @@ jobs: include: - platform: 'macos-latest' # for Arm-based macs (M1 and above). args: '--target aarch64-apple-darwin' + node_arch: 'x64' - platform: 'macos-latest' # for Intel-based macs. args: '--target x86_64-apple-darwin' + node_arch: 'arm64' - platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04. args: '' + node_arch: 'x64' - platform: 'windows-latest' args: '' + node_arch: 'x64' runs-on: ${{ matrix.platform }} steps: - name: Checkout yaakapp/app @@ -95,6 +99,7 @@ jobs: - uses: tauri-apps/tauri-action@v0 env: + NODE_ARCH: ${{ matrix.node_arch }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} diff --git a/plugin-runtime/scripts/generate-sea.cjs b/plugin-runtime/scripts/generate-sea.cjs index eb718a6d..05eba7e8 100644 --- a/plugin-runtime/scripts/generate-sea.cjs +++ b/plugin-runtime/scripts/generate-sea.cjs @@ -60,7 +60,8 @@ try { process.exit(1); } -const dstPath = path.join(destDir, DST_BIN_MAP[`${process.platform}_${process.arch}`]); +const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; +const dstPath = path.join(destDir, DST_BIN_MAP[key]); cpSync(tmpNodePath, dstPath); console.log(`Copied sea to ${dstPath}`) diff --git a/scripts/download-protoc.cjs b/scripts/download-protoc.cjs index b0868e2e..653c4e92 100644 --- a/scripts/download-protoc.cjs +++ b/scripts/download-protoc.cjs @@ -33,7 +33,7 @@ const SRC_BIN_MAP = { }; (async function () { - const key = `${process.platform}_${process.arch}`; + const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; const url = URL_MAP[key]; const tmpDir = path.join(os.tmpdir(), `${Math.random()}`); const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'protoc');