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 <[email protected]>
apple · Jan 30, 2025 · 5f98585 · 5f98585
1 parent a3ac5bd
commit 5f98585
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 48 deletions.
diff --git a/.circleci/config.pkl b/.circleci/config.pkl
@@ -105,18 +105,13 @@ local buildNativeJobs: Mapping<String, BuildNativeJob> = new {
 }
 
 local gradleCheckJobs: Mapping<String, GradleCheckJob> = new {
-  ["gradle-check-jdk17"] {
-    javaVersion = "17.0"
-    isRelease = false
-    os = "linux"
-  }
-  ["gradle-check-jdk21"] {
+  ["gradle-check"] {
     javaVersion = "21.0"
     isRelease = false
     os = "linux"
   }
-  ["gradle-check-jdk17-windows"] {
-    javaVersion = "17.0"
+  ["gradle-check-windows"] {
+    javaVersion = "21.0"
     isRelease = false
     os = "windows"
   }

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -581,19 +581,7 @@ jobs:
     resource_class: windows.large
     machine:
       image: windows-server-2022-gui:current
-  gradle-check-jdk17:
-    steps:
-    - checkout
-    - run:
-        command: ./gradlew --info --stacktrace -DtestReportsDir=${HOME}/test-results check
-        name: gradle check
-    - store_test_results:
-        path: ~/test-results
-    environment:
-      LANG: en_US.UTF-8
-    docker:
-    - image: cimg/openjdk:17.0
-  gradle-check-jdk21:
+  gradle-check:
     steps:
     - checkout
     - run:
@@ -605,14 +593,14 @@ jobs:
       LANG: en_US.UTF-8
     docker:
     - image: cimg/openjdk:21.0
-  gradle-check-jdk17-windows:
+  gradle-check-windows:
     steps:
     - checkout
     - run:
         command: |-
           # install jdk
           curl -Lf \
-          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
+          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
 
           unzip /tmp/jdk.zip -d /tmp/jdk \
             && cd /tmp/jdk/jdk-* \
@@ -742,13 +730,10 @@ workflows:
         type: approval
     - pr-approval/authenticate:
         context: pkl-pr-approval
-    - gradle-check-jdk17:
+    - gradle-check:
         requires:
         - hold
-    - gradle-check-jdk21:
-        requires:
-        - hold
-    - gradle-check-jdk17-windows:
+    - gradle-check-windows:
         requires:
         - hold
     when:
@@ -757,9 +742,8 @@ workflows:
         pattern: ^pull/\d+(/head)?$
   main:
     jobs:
-    - gradle-check-jdk17
-    - gradle-check-jdk21
-    - gradle-check-jdk17-windows
+    - gradle-check
+    - gradle-check-windows
     - bench
     - gradle-compatibility
     - pkl-cli-macOS-amd64-snapshot
@@ -770,9 +754,8 @@ workflows:
     - pkl-cli-windows-amd64-snapshot
     - deploy-snapshot:
         requires:
-        - gradle-check-jdk17
-        - gradle-check-jdk21
-        - gradle-check-jdk17-windows
+        - gradle-check
+        - gradle-check-windows
         - bench
         - gradle-compatibility
         - pkl-cli-macOS-amd64-snapshot
@@ -793,19 +776,13 @@ workflows:
       - << pipeline.git.branch >>
   release:
     jobs:
-    - gradle-check-jdk17:
-        filters:
-          branches:
-            ignore: /.*/
-          tags:
-            only: /^v?\d+\.\d+\.\d+$/
-    - gradle-check-jdk21:
+    - gradle-check:
         filters:
           branches:
             ignore: /.*/
           tags:
             only: /^v?\d+\.\d+\.\d+$/
-    - gradle-check-jdk17-windows:
+    - gradle-check-windows:
         filters:
           branches:
             ignore: /.*/
@@ -861,9 +838,8 @@ workflows:
             only: /^v?\d+\.\d+\.\d+$/
     - github-release:
         requires:
-        - gradle-check-jdk17
-        - gradle-check-jdk21
-        - gradle-check-jdk17-windows
+        - gradle-check
+        - gradle-check-windows
         - bench
         - gradle-compatibility
         - pkl-cli-macOS-amd64-release
@@ -899,9 +875,8 @@ workflows:
             only: /^v?\d+\.\d+\.\d+$/
   release-branch:
     jobs:
-    - gradle-check-jdk17
-    - gradle-check-jdk21
-    - gradle-check-jdk17-windows
+    - gradle-check
+    - gradle-check-windows
     - bench
     - gradle-compatibility
     - pkl-cli-macOS-amd64-release