From a7574f2e5a1d0b4ccf51439663964279b8bacadb Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 28 Nov 2025 08:16:24 -0800 Subject: [PATCH] Fix vendor scripts for arm --- scripts/vendor-node.cjs | 4 ++++ scripts/vendor-protoc.cjs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/vendor-node.cjs b/scripts/vendor-node.cjs index 4b1ec26a..05a33571 100644 --- a/scripts/vendor-node.cjs +++ b/scripts/vendor-node.cjs @@ -12,6 +12,7 @@ const MAC_X64 = 'darwin_x64'; const LNX_ARM = 'linux_arm64'; const LNX_X64 = 'linux_x64'; const WIN_X64 = 'win32_x64'; +const WIN_ARM = 'win32_arm64'; const URL_MAP = { [MAC_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-arm64.tar.gz`, @@ -19,6 +20,7 @@ const URL_MAP = { [LNX_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz`, [LNX_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz`, [WIN_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-win-x64.zip`, + [WIN_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-win-arm64.zip`, }; const SRC_BIN_MAP = { @@ -27,6 +29,7 @@ const SRC_BIN_MAP = { [LNX_ARM]: `node-${NODE_VERSION}-linux-arm64/bin/node`, [LNX_X64]: `node-${NODE_VERSION}-linux-x64/bin/node`, [WIN_X64]: `node-${NODE_VERSION}-win-x64/node.exe`, + [WIN_ARM]: `node-${NODE_VERSION}-win-arm64/node.exe`, }; const DST_BIN_MAP = { @@ -35,6 +38,7 @@ const DST_BIN_MAP = { [LNX_ARM]: 'yaaknode-aarch64-unknown-linux-gnu', [LNX_X64]: 'yaaknode-x86_64-unknown-linux-gnu', [WIN_X64]: 'yaaknode-x86_64-pc-windows-msvc.exe', + [WIN_ARM]: 'yaaknode-aarch64-pc-windows-msvc.exe', }; const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`; diff --git a/scripts/vendor-protoc.cjs b/scripts/vendor-protoc.cjs index 2e943c17..a3c5db60 100644 --- a/scripts/vendor-protoc.cjs +++ b/scripts/vendor-protoc.cjs @@ -12,6 +12,7 @@ const MAC_X64 = 'darwin_x64'; const LNX_ARM = 'linux_arm64'; const LNX_X64 = 'linux_x64'; const WIN_X64 = 'win32_x64'; +const WIN_ARM = 'win32_arm64'; const URL_MAP = { [MAC_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-aarch_64.zip`, @@ -19,6 +20,7 @@ const URL_MAP = { [LNX_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-aarch_64.zip`, [LNX_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-x86_64.zip`, [WIN_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-win64.zip`, + [WIN_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-win64.zip`, }; const SRC_BIN_MAP = { @@ -27,6 +29,7 @@ const SRC_BIN_MAP = { [LNX_ARM]: 'bin/protoc', [LNX_X64]: 'bin/protoc', [WIN_X64]: 'bin/protoc.exe', + [WIN_ARM]: 'bin/protoc.exe', }; const DST_BIN_MAP = { @@ -35,6 +38,7 @@ const DST_BIN_MAP = { [LNX_ARM]: 'yaakprotoc-aarch64-unknown-linux-gnu', [LNX_X64]: 'yaakprotoc-x86_64-unknown-linux-gnu', [WIN_X64]: 'yaakprotoc-x86_64-pc-windows-msvc.exe', + [WIN_ARM]: 'yaakprotoc-aarch64-pc-windows-msvc.exe', }; const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'protoc');