Fix native gvm ci (#930)

* Update GraalVM checksum
* Fix: download JDK on macOS

Signed-off-by: Sam Gammon <sam@elide.dev>
Co-authored-by: Sam Gammon <sam@elide.dev>

.circleci/config.yml

@@ -9,6 +9,17 @@ jobs:
     - run:
         command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
         name: Installing Rosetta 2
+    - run:
+        command: |-
+          # install jdk
+          curl -Lf \
+           https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz
+
+          mkdir $HOME/jdk \
+            && cd $HOME/jdk \
+            && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
+        name: Set up environment
+        shell: '#!/bin/bash -exo pipefail'
     - run:
         command: |-
           export PATH=~/staticdeps/bin:$PATH
@@ -22,6 +33,7 @@ jobs:
         path: ~/test-results
     environment:
       LANG: en_US.UTF-8
+      JAVA_HOME: /Users/distiller/jdk/Contents/Home
     resource_class: macos.m1.large.gen1
     macos:
       xcode: 15.3.0
@@ -105,6 +117,17 @@ jobs:
   pkl-cli-macOS-aarch64-release:
     steps:
     - checkout
+    - run:
+        command: |-
+          # install jdk
+          curl -Lf \
+           https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz
+
+          mkdir $HOME/jdk \
+            && cd $HOME/jdk \
+            && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
+        name: Set up environment
+        shell: '#!/bin/bash -exo pipefail'
     - run:
         command: |-
           export PATH=~/staticdeps/bin:$PATH
@@ -118,6 +141,7 @@ jobs:
         path: ~/test-results
     environment:
       LANG: en_US.UTF-8
+      JAVA_HOME: /Users/distiller/jdk/Contents/Home
     resource_class: macos.m1.large.gen1
     macos:
       xcode: 15.3.0
@@ -298,6 +322,17 @@ jobs:
     - run:
         command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
         name: Installing Rosetta 2
+    - run:
+        command: |-
+          # install jdk
+          curl -Lf \
+           https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz
+
+          mkdir $HOME/jdk \
+            && cd $HOME/jdk \
+            && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
+        name: Set up environment
+        shell: '#!/bin/bash -exo pipefail'
     - run:
         command: |-
           export PATH=~/staticdeps/bin:$PATH
@@ -311,6 +346,7 @@ jobs:
         path: ~/test-results
     environment:
       LANG: en_US.UTF-8
+      JAVA_HOME: /Users/distiller/jdk/Contents/Home
     resource_class: macos.m1.large.gen1
     macos:
       xcode: 15.3.0
@@ -394,6 +430,17 @@ jobs:
   pkl-cli-macOS-aarch64-snapshot:
     steps:
     - checkout
+    - run:
+        command: |-
+          # install jdk
+          curl -Lf \
+           https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz
+
+          mkdir $HOME/jdk \
+            && cd $HOME/jdk \
+            && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
+        name: Set up environment
+        shell: '#!/bin/bash -exo pipefail'
     - run:
         command: |-
           export PATH=~/staticdeps/bin:$PATH
@@ -407,6 +454,7 @@ jobs:
         path: ~/test-results
     environment:
       LANG: en_US.UTF-8
+      JAVA_HOME: /Users/distiller/jdk/Contents/Home
     resource_class: macos.m1.large.gen1
     macos:
       xcode: 15.3.0

.circleci/jobs/BuildNativeJob.pkl

@@ -87,6 +87,22 @@ local setupLinuxEnvironment: Config.RunStep =
       }.join("\n\n")
     }
 
+local setupMacEnvironment: Config.RunStep =
+  new {
+    name = "Set up environment"
+    shell = "#!/bin/bash -exo pipefail"
+    command =
+      #"""
+      # install jdk
+      curl -Lf \
+       https://github.com/adoptium/temurin\#(module.majorJdkVersion)-binaries/releases/download/\#(module.jdkGitHubReleaseName)/OpenJDK\#(module.majorJdkVersion)U-jdk_\#(if (arch == "amd64") "x64" else "aarch64")_mac_hotspot_\#(module.jdkVersionAlt).tar.gz -o /tmp/jdk.tar.gz
+
+      mkdir $HOME/jdk \
+        && cd $HOME/jdk \
+        && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
+      """#
+  }
+
 steps {
   when (os == "linux") {
     new Config.RestoreCacheStep {
@@ -102,13 +118,16 @@ steps {
       }
     }
   }
-  when (os == "macOS" && arch == "amd64") {
+  when (os == "macOS") {
-    new Config.RunStep {
+    when (arch == "amd64") {
-      name = "Installing Rosetta 2"
+      new Config.RunStep {
-      command = """
+        name = "Installing Rosetta 2"
-        /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+        command = """
-        """
+          /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+          """
+      }
     }
+    setupMacEnvironment
   }
   new Config.RunStep {
     name = "gradle buildNative"
@@ -140,6 +159,9 @@ job {
       xcode = "15.3.0"
     }
     resource_class = "macos.m1.large.gen1"
+    environment {
+      ["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home"
+    }
   }
   when (os == "linux") {
     docker = new Listing<Config.DockerImage> {

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ graalVmJdkVersion = "21.0.5"
 graalVmSha256-macos-x64 = "2d9b09e28bc1bb6ff219bf62eacc4626c7740b4f1829ede9ea4450f33e9c0826"
 graalVmSha256-macos-aarch64 = "cb68cb2c796f42f37a56fcd1385d8b86cca12e0b46c5618a5ed3ec7dd2260f6f"
 graalVmSha256-linux-x64 = "c1960d4f9d278458bde1cd15115ac2f0b3240cb427d51cfeceb79dab91a7f5c9"
-graalVmSha256-linux-aarch64 = "771b308852853cf93f7a3fc429741dd17502b8c5fa91930de6af8ded461e2dc3"
+graalVmSha256-linux-aarch64 = "3ad68fbb2d13da528dfa0aea9e9345383245ec9c31094dce3905cefba9aac01e"
 graalVmSha256-windows-x64 = "d5784cbdc87f84b5cbd6c9d09c6f1d4611954f139fcfc795005c58dffd7f6b41"
 ideaExtPlugin = "1.1.9"
 javaPoet = "0.+"