Explicit targets

.github/workflows/release.yml

@@ -17,26 +17,33 @@ jobs:
             args: '--target aarch64-apple-darwin'
             yaak_arch: 'arm64'
             os: 'macos'
+            targets: 'aarch64-apple-darwin'
           - platform: 'macos-latest' # for Intel-based Macs.
             args: '--target x86_64-apple-darwin'
             yaak_arch: 'x64'
             os: 'macos'
+            targets: 'x86_64-apple-darwin'
           - platform: 'ubuntu-22.04'
             args: ''
             yaak_arch: 'x64'
             os: 'ubuntu'
+            targets: ''
           - platform: 'ubuntu-22.04-arm'
             args: ''
             yaak_arch: 'arm64'
             os: 'ubuntu'
+            targets: ''
           - platform: 'windows-latest'
             args: ''
             yaak_arch: 'x64'
             os: 'windows'
-          - platform: 'windows-11-arm'
-            args: ''
+            targets: ''
+          # Windows ARM64
+          - platform: 'windows-latest'
+            args: '--target aarch64-pc-windows-msvc'
             yaak_arch: 'arm64'
             os: 'windows'
+            targets: 'aarch64-pc-windows-msvc'
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 40
     steps:
@@ -49,8 +56,7 @@ jobs:
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
         with:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.os == 'macos' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+          targets: ${{ matrix.targets }}
 
       - uses: Swatinem/rust-cache@v2
         with:

package-lock.json

@@ -62,7 +62,7 @@
       "devDependencies": {
         "@biomejs/biome": "^2.3.7",
         "@tauri-apps/cli": "^2.9.1",
-        "@yaakapp/cli": "^0.2.7",
+        "@yaakapp/cli": "^0.3.4",
         "nodejs-file-downloader": "^4.13.0",
         "npm-run-all": "^4.1.5",
         "typescript": "^5.8.3",
@@ -4162,26 +4162,30 @@
       "link": true
     },
     "node_modules/@yaakapp/cli": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.2.7.tgz",
-      "integrity": "sha512-YKtbBENDH+qv+2L0jJSu1a8KOCU8wpr9FpFv+mIxUOMOl709aADToASvKFTNwdG2nAPCzdF0OsFHtV6o20gurw==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.3.4.tgz",
+      "integrity": "sha512-bSSL3noEfyoPC0M+bj34jbBZbB+gwYLCHL9cf6BYHgkRQKlHFpvN6z8M2jQZljb+CTQdHK0NzosmwHLpjMmAVA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
         "yaakcli": "bin/cli.js"
       },
       "optionalDependencies": {
-        "@yaakapp/cli-darwin-arm64": "0.2.7",
-        "@yaakapp/cli-darwin-x64": "0.2.7",
-        "@yaakapp/cli-linux-arm64": "0.2.7",
-        "@yaakapp/cli-linux-x64": "0.2.7",
-        "@yaakapp/cli-win32-x64": "0.2.7"
+        "@yaakapp/cli-darwin-arm64": "0.3.4",
+        "@yaakapp/cli-darwin-x64": "0.3.4",
+        "@yaakapp/cli-linux-arm64": "0.3.4",
+        "@yaakapp/cli-linux-x64": "0.3.4",
+        "@yaakapp/cli-win32-arm64": "0.3.4",
+        "@yaakapp/cli-win32-x64": "0.3.4"
       }
     },
     "node_modules/@yaakapp/cli-darwin-arm64": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.2.7.tgz",
-      "integrity": "sha512-4mHr252cvoZoiR15n9QA2XMF03qoTS5vj4oK57ttc8Q9Vdn7ecvpKEVhqLh2VJRqcgLIbpF0H4LGZdiP66ExFQ==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.3.4.tgz",
+      "integrity": "sha512-iTohEO7XSVZwSvTgEQE9my3wGyWtTl1q8yfol7hHwVFTX7G8Geh8X2j2vVokHhj7J9OZL9jtYQWIsM1ekOHSEQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "optional": true,
       "os": [
@@ -4189,9 +4193,12 @@
       ]
     },
     "node_modules/@yaakapp/cli-darwin-x64": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.2.7.tgz",
-      "integrity": "sha512-uLaElBT0auiFX2g9mr29Vvhn3tzO47g2DFtfRyan121E7SqeygvteRNQaE8y5teUhzj+5Ocflvf0yXNa4ahg4Q==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.3.4.tgz",
+      "integrity": "sha512-gz7IcjFGKA0cCAum1Aq8kmVg7erYYSrZ9pliDw0NZyObjrBysJcsDXLodEU437u0pihtdCfoLsq3rsYYs8uwCA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
       "os": [
@@ -4199,9 +4206,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-arm64": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.2.7.tgz",
-      "integrity": "sha512-7ycIAnSezVabXAOcduyXDhuh7qHqDUP0dK6V9x88rElj0pwiP6NU4s15K/qbmscRnd2fjSZRXwetgounC8DEgQ==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.3.4.tgz",
+      "integrity": "sha512-Yiwz8PBkXngmr0lTMW1pgy+F/kUISkzvqofdoBseXTrS/GDxoW3ILnG3If30LuIyWWPgqpuU+qKMtbVDzuncPQ==",
       "cpu": [
         "arm64"
       ],
@@ -4212,9 +4219,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-x64": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.2.7.tgz",
-      "integrity": "sha512-h81IaJJYAsZx06tRuztm6GeC+4JtsLY+0s4TW5NgMnW2/qyRwxKbVTb+V7KxngSoYpTIsD48A2rdRN8odwEg1g==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.3.4.tgz",
+      "integrity": "sha512-j7/r18UYNlFChDVU5N5ye3mmL+OR9Uu3LY72JxW+s/SyV69Bo8Griii75Wt19z/jj2ES8pxD+4IJq56VF3wJ7w==",
       "cpu": [
         "x64"
       ],
@@ -4224,10 +4231,26 @@
         "linux"
       ]
     },
+    "node_modules/@yaakapp/cli-win32-arm64": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-arm64/-/cli-win32-arm64-0.3.4.tgz",
+      "integrity": "sha512-OUSKOKrSnzrTAGW0c+2ZCwA4yhgw/bA+gyeTvpf7cELVuB0qooGkEcJ3lM7fPMKmUbFU0r+K/Ggq1QMUr7cJLQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@yaakapp/cli-win32-x64": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.2.7.tgz",
-      "integrity": "sha512-66T/LXUnnmZ9FvQwRSzz/kvqc8GYvU1YXYEda21ZUiVQ5+2skMYsvpi8vtH8G0yCjZJLVtYqrc/rhaJ60CHH8w==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.3.4.tgz",
+      "integrity": "sha512-sVYnW1rROLbzFUCyeZ++ibN+8gJS7FdPnBRHIE0KORfeI4e7Gw/aMUji2qpSZ1gt3DrAU95DDNjBkDvGBAgqag==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "optional": true,
       "os": [

package.json

@@ -89,7 +89,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.3.7",
     "@tauri-apps/cli": "^2.9.1",
-    "@yaakapp/cli": "^0.2.7",
+    "@yaakapp/cli": "^0.3.4",
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.8.3",

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}`;

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');