Skip to content

Commit 8d9c22c

Browse files
committed
chore: update circleci jobs for multi-jdk testing
- chore: update to jdk21 in circle jobs - chore: re-gen circle jobs Signed-off-by: Sam Gammon <sam@elide.dev>
1 parent fec5f1e commit 8d9c22c

File tree

2 files changed

+18
-48
lines changed

2 files changed

+18
-48
lines changed

.circleci/config.pkl

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,13 @@ local buildNativeJobs: Mapping<String, BuildNativeJob> = new {
105105
}
106106

107107
local gradleCheckJobs: Mapping<String, GradleCheckJob> = new {
108-
["gradle-check-jdk17"] {
109-
javaVersion = "17.0"
110-
isRelease = false
111-
os = "linux"
112-
}
113-
["gradle-check-jdk21"] {
108+
["gradle-check"] {
114109
javaVersion = "21.0"
115110
isRelease = false
116111
os = "linux"
117112
}
118-
["gradle-check-jdk17-windows"] {
119-
javaVersion = "17.0"
113+
["gradle-check-windows"] {
114+
javaVersion = "21.0"
120115
isRelease = false
121116
os = "windows"
122117
}

.circleci/config.yml

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -581,19 +581,7 @@ jobs:
581581
resource_class: windows.large
582582
machine:
583583
image: windows-server-2022-gui:current
584-
gradle-check-jdk17:
585-
steps:
586-
- checkout
587-
- run:
588-
command: ./gradlew --info --stacktrace -DtestReportsDir=${HOME}/test-results check
589-
name: gradle check
590-
- store_test_results:
591-
path: ~/test-results
592-
environment:
593-
LANG: en_US.UTF-8
594-
docker:
595-
- image: cimg/openjdk:17.0
596-
gradle-check-jdk21:
584+
gradle-check:
597585
steps:
598586
- checkout
599587
- run:
@@ -605,14 +593,14 @@ jobs:
605593
LANG: en_US.UTF-8
606594
docker:
607595
- image: cimg/openjdk:21.0
608-
gradle-check-jdk17-windows:
596+
gradle-check-windows:
609597
steps:
610598
- checkout
611599
- run:
612600
command: |-
613601
# install jdk
614602
curl -Lf \
615-
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9.1/OpenJDK17U-jdk_x64_windows_hotspot_17.0.9_9.zip -o /tmp/jdk.zip
603+
https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_windows_hotspot_21.0.5_11.zip -o /tmp/jdk.zip
616604
617605
unzip /tmp/jdk.zip -d /tmp/jdk \
618606
&& cd /tmp/jdk/jdk-* \
@@ -742,13 +730,10 @@ workflows:
742730
type: approval
743731
- pr-approval/authenticate:
744732
context: pkl-pr-approval
745-
- gradle-check-jdk17:
733+
- gradle-check:
746734
requires:
747735
- hold
748-
- gradle-check-jdk21:
749-
requires:
750-
- hold
751-
- gradle-check-jdk17-windows:
736+
- gradle-check-windows:
752737
requires:
753738
- hold
754739
when:
@@ -757,9 +742,8 @@ workflows:
757742
pattern: ^pull/\d+(/head)?$
758743
main:
759744
jobs:
760-
- gradle-check-jdk17
761-
- gradle-check-jdk21
762-
- gradle-check-jdk17-windows
745+
- gradle-check
746+
- gradle-check-windows
763747
- bench
764748
- gradle-compatibility
765749
- pkl-cli-macOS-amd64-snapshot
@@ -770,9 +754,8 @@ workflows:
770754
- pkl-cli-windows-amd64-snapshot
771755
- deploy-snapshot:
772756
requires:
773-
- gradle-check-jdk17
774-
- gradle-check-jdk21
775-
- gradle-check-jdk17-windows
757+
- gradle-check
758+
- gradle-check-windows
776759
- bench
777760
- gradle-compatibility
778761
- pkl-cli-macOS-amd64-snapshot
@@ -793,19 +776,13 @@ workflows:
793776
- << pipeline.git.branch >>
794777
release:
795778
jobs:
796-
- gradle-check-jdk17:
797-
filters:
798-
branches:
799-
ignore: /.*/
800-
tags:
801-
only: /^v?\d+\.\d+\.\d+$/
802-
- gradle-check-jdk21:
779+
- gradle-check:
803780
filters:
804781
branches:
805782
ignore: /.*/
806783
tags:
807784
only: /^v?\d+\.\d+\.\d+$/
808-
- gradle-check-jdk17-windows:
785+
- gradle-check-windows:
809786
filters:
810787
branches:
811788
ignore: /.*/
@@ -861,9 +838,8 @@ workflows:
861838
only: /^v?\d+\.\d+\.\d+$/
862839
- github-release:
863840
requires:
864-
- gradle-check-jdk17
865-
- gradle-check-jdk21
866-
- gradle-check-jdk17-windows
841+
- gradle-check
842+
- gradle-check-windows
867843
- bench
868844
- gradle-compatibility
869845
- pkl-cli-macOS-amd64-release
@@ -899,9 +875,8 @@ workflows:
899875
only: /^v?\d+\.\d+\.\d+$/
900876
release-branch:
901877
jobs:
902-
- gradle-check-jdk17
903-
- gradle-check-jdk21
904-
- gradle-check-jdk17-windows
878+
- gradle-check
879+
- gradle-check-windows
905880
- bench
906881
- gradle-compatibility
907882
- pkl-cli-macOS-amd64-release

0 commit comments

Comments
 (0)