Merge pull request #48 from Aidan63/arm-mac

Support ARM OSX
krdlab · Jul 14, 2024 · 66f10ed · 66f10ed
2 parents 1abb31a + 822c0a7
commit 66f10ed
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - macos-13
+        - macos-latest
         - ubuntu-latest
         - windows-latest
         haxe:

diff --git a/dist/index.js b/dist/index.js
@@ -149,12 +149,12 @@ class Asset {
         return found ? toolRoot : null;
     }
 }
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-linux64.tar.gz
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-osx64.tar.gz
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-win64.zip
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.3.0-rc.1-linux64.tar.gz
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.4.0-rc.1-osx-universal.tar.gz
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.3.0-rc.1-win64.zip
 class NekoAsset extends Asset {
     static resolveFromHaxeVersion(version) {
-        const nekoVer = version.startsWith('3.') ? '2.1.0' : '2.3.0'; // Haxe 3 only supports neko 2.1
+        const nekoVer = version.startsWith('3.') ? '2.1.0' : '2.4.0-rc.1'; // Haxe 3 only supports neko 2.1
         return new NekoAsset(nekoVer);
     }
     constructor(version, env = new Env()) {
@@ -169,6 +169,9 @@ class NekoAsset extends Asset {
         if (this.env.platform === 'win' && this.version.startsWith('2.1')) {
             return this.env.platform;
         }
+        if (this.env.platform === 'osx' && this.version.startsWith('2.4')) {
+            return 'osx-universal';
+        }
         return `${this.env.platform}${this.env.arch}`;
     }
     get fileNameWithoutExt() {
@@ -249,14 +252,13 @@ class Env {
     }
     get arch() {
         const arch = external_node_os_namespaceObject.arch();
-        switch (arch) {
-            case 'x64': {
-                return '64';
-            }
-            default: {
-                throw new Error(`${arch} not supported`);
-            }
+        if (arch === 'x64') {
+            return '64';
+        }
+        if (arch === 'arm64' && this.platform === 'osx') {
+            return '64';
         }
+        throw new Error(`${arch} not supported`);
     }
 }
 

diff --git a/src/asset.ts b/src/asset.ts
@@ -100,12 +100,12 @@ abstract class Asset {
   }
 }
 
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-linux64.tar.gz
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-osx64.tar.gz
-// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-3-0/neko-2.3.0-win64.zip
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.3.0-rc.1-linux64.tar.gz
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.4.0-rc.1-osx-universal.tar.gz
+// * NOTE https://github.com/HaxeFoundation/neko/releases/download/v2-4-0-rc-1/neko-2.3.0-rc.1-win64.zip
 export class NekoAsset extends Asset {
   static resolveFromHaxeVersion(version: string) {
-    const nekoVer = version.startsWith('3.') ? '2.1.0' : '2.3.0'; // Haxe 3 only supports neko 2.1
+    const nekoVer = version.startsWith('3.') ? '2.1.0' : '2.4.0-rc.1'; // Haxe 3 only supports neko 2.1
     return new NekoAsset(nekoVer);
   }
 
@@ -126,6 +126,10 @@ export class NekoAsset extends Asset {
       return this.env.platform;
     }
 
+    if (this.env.platform === 'osx' && this.version.startsWith('2.4')) {
+      return 'osx-universal';
+    }
+
     return `${this.env.platform}${this.env.arch}`;
   }
 
@@ -229,14 +233,15 @@ export class Env {
 
   get arch() {
     const arch = os.arch();
-    switch (arch) {
-      case 'x64': {
-        return '64';
-      }
 
-      default: {
-        throw new Error(`${arch} not supported`);
-      }
+    if (arch === 'x64') {
+      return '64';
+    }
+
+    if (arch === 'arm64' && this.platform === 'osx') {
+      return '64';
     }
+
+    throw new Error(`${arch} not supported`);
   }
 }