NODE_ARCH -> YAAK_TARGET_ARCH

This commit is contained in:
Gregory Schier
2024-07-23 14:52:25 -07:00
parent 73e815d059
commit bf1ad208c5
3 changed files with 7 additions and 7 deletions

View File

@@ -18,16 +18,16 @@ jobs:
include: include:
- platform: 'macos-latest' # for Arm-based macs (M1 and above). - platform: 'macos-latest' # for Arm-based macs (M1 and above).
args: '--target aarch64-apple-darwin' args: '--target aarch64-apple-darwin'
node_arch: 'arm64' yaak_arch: 'arm64'
- platform: 'macos-latest' # for Intel-based macs. - platform: 'macos-latest' # for Intel-based macs.
args: '--target x86_64-apple-darwin' args: '--target x86_64-apple-darwin'
node_arch: 'x64' yaak_arch: 'x64'
- platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04. - platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04.
args: '' args: ''
node_arch: 'x64' yaak_arch: 'x64'
- platform: 'windows-latest' - platform: 'windows-latest'
args: '' args: ''
node_arch: 'x64' yaak_arch: 'x64'
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
steps: steps:
- name: Checkout yaakapp/app - name: Checkout yaakapp/app
@@ -100,7 +100,7 @@ jobs:
- uses: tauri-apps/tauri-action@v0 - uses: tauri-apps/tauri-action@v0
env: env:
YAAK_PLUGINS_DIR: ${{ env.YAAK_PLUGINS_DIR }} YAAK_PLUGINS_DIR: ${{ env.YAAK_PLUGINS_DIR }}
NODE_ARCH: ${{ matrix.node_arch }} YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}

View File

@@ -35,7 +35,7 @@ rmSync(dstDir, {recursive: true, force: true});
mkdirSync(dstDir, {recursive: true}); mkdirSync(dstDir, {recursive: true});
(async function () { (async function () {
const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; const key = `${process.platform}_${process.env.YAKK_TARGET_ARCH ?? process.arch}`;
console.log('Vendoring NodeJS binary for', key); console.log('Vendoring NodeJS binary for', key);
const url = URL_MAP[key]; const url = URL_MAP[key];
const tmpDir = path.join(__dirname, 'tmp', new Date().toISOString()); const tmpDir = path.join(__dirname, 'tmp', new Date().toISOString());

View File

@@ -36,7 +36,7 @@ rmSync(dstDir, {recursive: true, force: true});
mkdirSync(dstDir, {recursive: true}); mkdirSync(dstDir, {recursive: true});
(async function () { (async function () {
const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;
const url = URL_MAP[key]; const url = URL_MAP[key];
const tmpDir = path.join(__dirname, 'tmp', new Date().toISOString()); const tmpDir = path.join(__dirname, 'tmp', new Date().toISOString());