Skip to content

Commit 294d5b6

Browse files
bioballbioball
committed
Fixes
1 parent f35bcba commit 294d5b6

File tree

3 files changed

+37
-63
lines changed

3 files changed

+37
-63
lines changed

‎.circleci/config.pkl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import "jobs/GradleCheckJob.pkl"
2121
import "jobs/DeployJob.pkl"
2222
import "jobs/SimpleGradleJob.pkl"
2323

24-
local prbJobs: Listing<String> = gradleCheckJobs.keys.toListing()
24+
local prbJobs: Listing<String> = (gradleCheckJobs.keys.toListing()) {
25+
"pkl-cli-macOS-aarch64-snapshot"
26+
}
2527

2628
local buildAndTestJobs = (prbJobs) {
2729
"bench"

‎.circleci/config.yml‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ jobs:
1818
mkdir $HOME/jdk \
1919
&& cd $HOME/jdk \
2020
&& 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
3021
name: Set up environment
3122
shell: '#!/bin/bash -exo pipefail'
3223
- run:
@@ -42,6 +33,7 @@ jobs:
4233
path: ~/test-results
4334
environment:
4435
LANG: en_US.UTF-8
36+
JAVA_HOME: ~/jdk/Contents/Home
4537
resource_class: macos.m1.large.gen1
4638
macos:
4739
xcode: 15.3.0
@@ -134,15 +126,6 @@ jobs:
134126
mkdir $HOME/jdk \
135127
&& cd $HOME/jdk \
136128
&& 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
146129
name: Set up environment
147130
shell: '#!/bin/bash -exo pipefail'
148131
- run:
@@ -158,6 +141,7 @@ jobs:
158141
path: ~/test-results
159142
environment:
160143
LANG: en_US.UTF-8
144+
JAVA_HOME: ~/jdk/Contents/Home
161145
resource_class: macos.m1.large.gen1
162146
macos:
163147
xcode: 15.3.0
@@ -347,15 +331,6 @@ jobs:
347331
mkdir $HOME/jdk \
348332
&& cd $HOME/jdk \
349333
&& 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
359334
name: Set up environment
360335
shell: '#!/bin/bash -exo pipefail'
361336
- run:
@@ -371,6 +346,7 @@ jobs:
371346
path: ~/test-results
372347
environment:
373348
LANG: en_US.UTF-8
349+
JAVA_HOME: ~/jdk/Contents/Home
374350
resource_class: macos.m1.large.gen1
375351
macos:
376352
xcode: 15.3.0
@@ -463,15 +439,6 @@ jobs:
463439
mkdir $HOME/jdk \
464440
&& cd $HOME/jdk \
465441
&& 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
475442
name: Set up environment
476443
shell: '#!/bin/bash -exo pipefail'
477444
- run:
@@ -487,6 +454,7 @@ jobs:
487454
path: ~/test-results
488455
environment:
489456
LANG: en_US.UTF-8
457+
JAVA_HOME: ~/jdk/Contents/Home
490458
resource_class: macos.m1.large.gen1
491459
macos:
492460
xcode: 15.3.0
@@ -816,6 +784,9 @@ workflows:
816784
- gradle-check-windows:
817785
requires:
818786
- hold
787+
- pkl-cli-macOS-aarch64-snapshot:
788+
requires:
789+
- hold
819790
when:
820791
matches:
821792
value: << pipeline.git.branch >>
@@ -824,6 +795,7 @@ workflows:
824795
jobs:
825796
- gradle-check
826797
- gradle-check-windows
798+
- pkl-cli-macOS-aarch64-snapshot
827799
- bench
828800
- gradle-compatibility
829801
- pkl-cli-macOS-amd64-snapshot
@@ -836,6 +808,7 @@ workflows:
836808
requires:
837809
- gradle-check
838810
- gradle-check-windows
811+
- pkl-cli-macOS-aarch64-snapshot
839812
- bench
840813
- gradle-compatibility
841814
- pkl-cli-macOS-amd64-snapshot
@@ -868,6 +841,12 @@ workflows:
868841
ignore: /.*/
869842
tags:
870843
only: /^v?\d+\.\d+\.\d+$/
844+
- pkl-cli-macOS-aarch64-snapshot:
845+
filters:
846+
branches:
847+
ignore: /.*/
848+
tags:
849+
only: /^v?\d+\.\d+\.\d+$/
871850
- bench:
872851
filters:
873852
branches:
@@ -920,6 +899,7 @@ workflows:
920899
requires:
921900
- gradle-check
922901
- gradle-check-windows
902+
- pkl-cli-macOS-aarch64-snapshot
923903
- bench
924904
- gradle-compatibility
925905
- pkl-cli-macOS-amd64-release
@@ -957,6 +937,7 @@ workflows:
957937
jobs:
958938
- gradle-check
959939
- gradle-check-windows
940+
- pkl-cli-macOS-aarch64-snapshot
960941
- bench
961942
- gradle-compatibility
962943
- pkl-cli-macOS-amd64-release

‎.circleci/jobs/BuildNativeJob.pkl‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -88,32 +88,20 @@ local setupLinuxEnvironment: Config.RunStep =
8888
}
8989

9090
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-
}
91+
new {
92+
name = "Set up environment"
93+
shell = "#!/bin/bash -exo pipefail"
94+
command =
95+
#"""
96+
# install jdk
97+
curl -Lf \
98+
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
99+
100+
mkdir $HOME/jdk \
101+
&& cd $HOME/jdk \
102+
&& cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC .
103+
"""#
104+
}
117105

118106
steps {
119107
when (os == "linux") {
@@ -171,6 +159,9 @@ job {
171159
xcode = "15.3.0"
172160
}
173161
resource_class = "macos.m1.large.gen1"
162+
environment {
163+
["JAVA_HOME"] = "~/jdk/Contents/Home"
164+
}
174165
}
175166
when (os == "linux") {
176167
docker = new Listing<Config.DockerImage> {

0 commit comments

Comments
 (0)