Setup MacOS aarch64.

Work towards #17
a-scie · Nov 7, 2022 · 49d60c5 · 49d60c5
1 parent 2024f33
commit 49d60c5
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,6 +30,9 @@ jobs:
           - os: macos-11
             arch: macos-x86_64
             examples: [python, java, node]
+          - os: macos-13-aarch64
+            arch: macos-aarch64
+            examples: [java, node]
           - os: windows-2022
             arch: windows-x86_64
             examples: [java, node]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11, windows-2022 ]
+        os: [ ubuntu-20.04, macos-11, macos-13-aarch64, windows-2022 ]
     environment: Release
     steps:
       - name: Checkout scie-jump ${{ needs.determine-tag.outputs.release-tag }}

diff --git a/examples/java.fetch b/examples/java.fetch
@@ -1,5 +1,6 @@
 https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-linux-aarch64.tar.gz
 https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-macosx-aarch64.tar.gz
 https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-macosx-x64.tar.gz
 https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-windows-x64-jdk.zip
 https://github.com/coursier/launchers/raw/698cff9cf28f7354637a63c9c1126c03b60dd174/coursier.jar
diff --git a/examples/java/lift.macos-aarch64.json b/examples/java/lift.macos-aarch64.json
@@ -0,0 +1,35 @@
+{
+  "scie": {
+    "lift": {
+      "name": "coursier",
+      "boot": {
+        "commands": {
+          "": {
+            "env": {
+              "=JAVA_HOME": "{jdk}/amazon-corretto-11.jdk/Contents/Home",
+              "=PATH": "{jdk}/amazon-corretto-11.jdk/Contents/Home/bin:{scie.env.PATH}"
+            },
+            "exe": "{jdk}/amazon-corretto-11.jdk/Contents/Home/bin/java",
+            "args": [
+              "-jar",
+              "{coursier.jar}"
+            ]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "amazon-corretto-11.0.17.8.1-macosx-aarch64.tar.gz",
+          "key": "jdk"
+        },
+        {
+          "name": "coursier.jar"
+        }
+      ]
+    }
+  },
+  "custom": {
+    "arbitrary": 3
+  },
+  "more": ["and", "more"]
+}
diff --git a/examples/node.fetch b/examples/node.fetch
@@ -1,3 +1,4 @@
+https://nodejs.org/dist/v18.12.0/node-v18.12.0-darwin-arm64.tar.gz
 https://nodejs.org/dist/v18.12.0/node-v18.12.0-darwin-x64.tar.gz
 https://nodejs.org/dist/v18.12.0/node-v18.12.0-linux-arm64.tar.xz
 https://nodejs.org/dist/v18.12.0/node-v18.12.0-linux-x64.tar.xz

diff --git a/examples/node/cowsay-lift.macos-aarch64.json b/examples/node/cowsay-lift.macos-aarch64.json
@@ -0,0 +1,30 @@
+{
+  "scie": {
+    "lift": {
+      "name": "cowsay.js",
+      "boot": {
+        "commands": {
+          "": {
+            "env": {
+              "NODE_PATH": "{node_modules}",
+              "=PATH": "{node}/node-v18.12.0-darwin-arm64/bin:{scie.env.PATH}"
+            },
+            "exe": "{node}/node-v18.12.0-darwin-arm64/bin/node",
+            "args": [
+              "{node_modules}/cowsay/cli.js"
+            ]
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "node-v18.12.0-darwin-arm64.tar.gz",
+          "key": "node"
+        },
+        {
+          "name": "node_modules"
+        }
+      ]
+    }
+  }
+}
diff --git a/examples/node/lift.macos-aarch64.json b/examples/node/lift.macos-aarch64.json
@@ -0,0 +1,29 @@
+{
+  "scie": {
+    "lift": {
+      "name": "node.js",
+      "boot": {
+        "commands": {
+          "node": {
+            "env": {
+              "=PATH": "{node}/node-v18.12.0-darwin-arm64/bin:{scie.env.PATH}"
+            },
+            "exe": "{node}/node-v18.12.0-darwin-arm64/bin/node"
+          },
+          "npm": {
+            "env": {
+              "=PATH": "{node}/node-v18.12.0-darwin-arm64/bin:{scie.env.PATH}"
+            },
+            "exe": "{node}/node-v18.12.0-darwin-arm64/bin/npm"
+          }
+        }
+      },
+      "files": [
+        {
+          "name": "node-v18.12.0-darwin-arm64.tar.gz",
+          "key": "node"
+        }
+      ]
+    }
+  }
+}