fix(macos): Detect x86_64 artifacts on aarch64 runners (#776)

tauri-apps · Apr 25, 2024 · 14e3c6c · 14e3c6c
1 parent 9e6e292
commit 14e3c6c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/.changes/macos-x64-on-arm-runner.md b/.changes/macos-x64-on-arm-runner.md
@@ -0,0 +1,5 @@
+---
+action: patch
+---
+
+Fixed an issue causing x86_64 artifacts to be handled as aarch64 on GitHub's new M1 runners.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/utils.ts b/src/utils.ts
@@ -42,13 +42,15 @@ export function getAssetName(assetPath: string) {
 
   let arch = '';
   if (ext === '.app.tar.gz.sig' || ext === '.app.tar.gz') {
-    const os_arch = process.arch === 'arm64' ? '_aarch64' : '_x64';
-
-    arch = assetPath.includes('universal-apple-darwin')
-      ? '_universal'
-      : assetPath.includes('aarch64-apple-darwin')
-        ? '_aarch64'
-        : os_arch;
+    if (assetPath.includes('universal-apple-darwin')) {
+      arch = '_universal';
+    } else if (assetPath.includes('aarch64-apple-darwin')) {
+      arch = '_aarch64';
+    } else if (assetPath.includes('x86_64-apple-darwin')) {
+      arch = '_x64';
+    } else {
+      arch = process.arch === 'arm64' ? '_aarch64' : '_x64';
+    }
   }
 
   return assetPath.includes(`${path.sep}debug${path.sep}`)