Fix the Apple Silicon (macOS aarch64 / arm64) URLs for Julia nigh…

…tly (#220) * fix aarch64 urls for nightly * rebuild js for aarch64 nightly * test nightly on apple m1 (aarch64) * Run on more macOS versions, and add a few comments --------- Co-authored-by: Dilum Aluthge <[email protected]>
julia-actions · Feb 11, 2024 · 0f702cc · 0f702cc
1 parent bb12998
commit 0f702cc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/.github/workflows/example-builds-nightly-defaultarch.yml b/.github/workflows/example-builds-nightly-defaultarch.yml
@@ -19,7 +19,14 @@ jobs:
       fail-fast: false
       matrix:
         julia-version: [nightly, 1.10-nightly]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-11 # Intel
+          - macos-12 # Intel
+          - macos-13 # Intel
+          - macos-14 # Apple Silicon
+          - macos-latest # Currently Intel, but will probably point to Apple Silicon in the future
 
     steps:
       - uses: actions/checkout@v4

diff --git a/lib/installer.js b/lib/installer.js
diff --git a/src/installer.ts b/src/installer.ts
@@ -128,10 +128,19 @@ function getNightlyFileName(arch: string): string {
     } else if (osPlat == 'darwin') {
         if (arch == 'x86') {
             throw new Error('32-bit Julia is not available on macOS')
+        } else if (arch == 'aarch64') {
+            versionExt = '-macaarch64'
+        } else {
+            versionExt = '-mac64'
         }
-        versionExt = '-mac64'
     } else if (osPlat === 'linux') {
-        versionExt = arch == 'x64' ? '-linux64' : '-linux32'
+        if (arch == 'x86') {
+            versionExt = '-linux32'
+        } else if (arch == 'aarch64') {
+            versionExt = '-linux-aarch64'
+        } else {
+            versionExt = '-linux64'
+        }
     } else {
         throw new Error(`Platform ${osPlat} is not supported`)
     }