Skip to content

Commit f35bcba

Browse files
sgammonsgammon
committed
fix: install jdk21 during mac ci runs
Signed-off-by: Sam Gammon <sam@elide.dev>
1 parent 5a22ccc commit f35bcba

File tree

2 files changed

+117
-6
lines changed

2 files changed

+117
-6
lines changed

‎.circleci/config.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ jobs:
99
- run:
1010
command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
1111
name: Installing Rosetta 2
12+
- run:
13+
command: |-
14+
# install jdk
15+
curl -Lf \
16+
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
17+
18+
mkdir $HOME/jdk \
19+
&& cd $HOME/jdk \
20+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
21+
22+
export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk"
23+
export JAVA_HOME="$JAVA_ROOT/Contents/Home"
24+
export PATH="$JAVA_HOME/bin:$PATH"
25+
mv $HOME/jdk $JAVA_ROOT
26+
/usr/libexec/java_home -V
27+
java -version
28+
mkdir -p $HOME/.gradle
29+
echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties
30+
name: Set up environment
31+
shell: '#!/bin/bash -exo pipefail'
1232
- run:
1333
command: |-
1434
export PATH=~/staticdeps/bin:$PATH
@@ -105,6 +125,26 @@ jobs:
105125
pkl-cli-macOS-aarch64-release:
106126
steps:
107127
- checkout
128+
- run:
129+
command: |-
130+
# install jdk
131+
curl -Lf \
132+
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
133+
134+
mkdir $HOME/jdk \
135+
&& cd $HOME/jdk \
136+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
137+
138+
export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk"
139+
export JAVA_HOME="$JAVA_ROOT/Contents/Home"
140+
export PATH="$JAVA_HOME/bin:$PATH"
141+
mv $HOME/jdk $JAVA_ROOT
142+
/usr/libexec/java_home -V
143+
java -version
144+
mkdir -p $HOME/.gradle
145+
echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties
146+
name: Set up environment
147+
shell: '#!/bin/bash -exo pipefail'
108148
- run:
109149
command: |-
110150
export PATH=~/staticdeps/bin:$PATH
@@ -298,6 +338,26 @@ jobs:
298338
- run:
299339
command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
300340
name: Installing Rosetta 2
341+
- run:
342+
command: |-
343+
# install jdk
344+
curl -Lf \
345+
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
346+
347+
mkdir $HOME/jdk \
348+
&& cd $HOME/jdk \
349+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
350+
351+
export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk"
352+
export JAVA_HOME="$JAVA_ROOT/Contents/Home"
353+
export PATH="$JAVA_HOME/bin:$PATH"
354+
mv $HOME/jdk $JAVA_ROOT
355+
/usr/libexec/java_home -V
356+
java -version
357+
mkdir -p $HOME/.gradle
358+
echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties
359+
name: Set up environment
360+
shell: '#!/bin/bash -exo pipefail'
301361
- run:
302362
command: |-
303363
export PATH=~/staticdeps/bin:$PATH
@@ -394,6 +454,26 @@ jobs:
394454
pkl-cli-macOS-aarch64-snapshot:
395455
steps:
396456
- checkout
457+
- run:
458+
command: |-
459+
# install jdk
460+
curl -Lf \
461+
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
462+
463+
mkdir $HOME/jdk \
464+
&& cd $HOME/jdk \
465+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
466+
467+
export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk"
468+
export JAVA_HOME="$JAVA_ROOT/Contents/Home"
469+
export PATH="$JAVA_HOME/bin:$PATH"
470+
mv $HOME/jdk $JAVA_ROOT
471+
/usr/libexec/java_home -V
472+
java -version
473+
mkdir -p $HOME/.gradle
474+
echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties
475+
name: Set up environment
476+
shell: '#!/bin/bash -exo pipefail'
397477
- run:
398478
command: |-
399479
export PATH=~/staticdeps/bin:$PATH

‎.circleci/jobs/BuildNativeJob.pkl‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,34 @@ local setupLinuxEnvironment: Config.RunStep =
8787
}.join("\n\n")
8888
}
8989

90+
local setupMacEnvironment: Config.RunStep =
91+
let (muslVersion = "1.2.2")
92+
let (zlibVersion = "1.2.13")
93+
new {
94+
name = "Set up environment"
95+
shell = "#!/bin/bash -exo pipefail"
96+
command = new Listing {
97+
#"""
98+
# install jdk
99+
curl -Lf \
100+
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
101+
102+
mkdir $HOME/jdk \
103+
&& cd $HOME/jdk \
104+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
105+
106+
export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-\#(module.majorJdkVersion).jdk"
107+
export JAVA_HOME="$JAVA_ROOT/Contents/Home"
108+
export PATH="$JAVA_HOME/bin:$PATH"
109+
mv $HOME/jdk $JAVA_ROOT
110+
/usr/libexec/java_home -V
111+
java -version
112+
mkdir -p $HOME/.gradle
113+
echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties
114+
"""#
115+
}.join("\n\n")
116+
}
117+
90118
steps {
91119
when (os == "linux") {
92120
new Config.RestoreCacheStep {
@@ -102,13 +130,16 @@ steps {
102130
}
103131
}
104132
}
105-
when (os == "macOS" && arch == "amd64") {
106-
new Config.RunStep {
107-
name = "Installing Rosetta 2"
108-
command = """
109-
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
110-
"""
133+
when (os == "macOS") {
134+
when (arch == "amd64") {
135+
new Config.RunStep {
136+
name = "Installing Rosetta 2"
137+
command = """
138+
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
139+
"""
140+
}
111141
}
142+
setupMacEnvironment
112143
}
113144
new Config.RunStep {
114145
name = "gradle buildNative"

0 commit comments

Comments
 (0)