From e08453ea4de1271250f36cfc9139254635b8574a Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 3 Feb 2025 15:43:40 -0800 Subject: [PATCH] fix: upgrade ci jobs to jdk 21 Signed-off-by: Sam Gammon --- .circleci/config.yml | 24 ++++++++++++------------ .circleci/jobs/BuildNativeJob.pkl | 2 +- .circleci/jobs/DeployJob.pkl | 2 +- .circleci/jobs/SimpleGradleJob.pkl | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 87174960f..1e3348542 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -136,7 +136,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -197,7 +197,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -266,7 +266,7 @@ jobs: 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-* \ @@ -329,7 +329,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -425,7 +425,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -486,7 +486,7 @@ jobs: # install jdk curl -Lf \ - https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz mkdir /jdk \ && cd /jdk \ @@ -555,7 +555,7 @@ jobs: 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-* \ @@ -630,7 +630,7 @@ jobs: environment: LANG: en_US.UTF-8 docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:21.0 gradle-compatibility: steps: - checkout @@ -644,7 +644,7 @@ jobs: environment: LANG: en_US.UTF-8 docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:21.0 deploy-snapshot: steps: - checkout @@ -661,7 +661,7 @@ jobs: environment: LANG: en_US.UTF-8 docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:21.0 deploy-release: steps: - checkout @@ -678,7 +678,7 @@ jobs: environment: LANG: en_US.UTF-8 docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:21.0 github-release: steps: - attach_workspace: diff --git a/.circleci/jobs/BuildNativeJob.pkl b/.circleci/jobs/BuildNativeJob.pkl index 3405e720f..b630587fb 100644 --- a/.circleci/jobs/BuildNativeJob.pkl +++ b/.circleci/jobs/BuildNativeJob.pkl @@ -24,7 +24,7 @@ arch: "amd64"|"aarch64" /// Whether to link to musl. Otherwise, links to glibc. musl: Boolean = false -javaVersion = "17.0" +javaVersion = "21.0" local setupLinuxEnvironment: Config.RunStep = let (muslVersion = "1.2.2") diff --git a/.circleci/jobs/DeployJob.pkl b/.circleci/jobs/DeployJob.pkl index b61269815..9a6b85741 100644 --- a/.circleci/jobs/DeployJob.pkl +++ b/.circleci/jobs/DeployJob.pkl @@ -19,7 +19,7 @@ import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.2#/Config.pkl" local self = this -javaVersion = "17.0" +javaVersion = "21.0" command: String diff --git a/.circleci/jobs/SimpleGradleJob.pkl b/.circleci/jobs/SimpleGradleJob.pkl index 8f33706ce..4a454c218 100644 --- a/.circleci/jobs/SimpleGradleJob.pkl +++ b/.circleci/jobs/SimpleGradleJob.pkl @@ -23,7 +23,7 @@ command: String os = "linux" -javaVersion = "17.0" +javaVersion = "21.0" steps { new Config.RunStep { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7eba50f3..95f819994 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ graalVmSha256-macos-x64 = "2d9b09e28bc1bb6ff219bf62eacc4626c7740b4f1829ede9ea445 graalVmSha256-macos-aarch64 = "cb68cb2c796f42f37a56fcd1385d8b86cca12e0b46c5618a5ed3ec7dd2260f6f" graalVmSha256-linux-x64 = "c1960d4f9d278458bde1cd15115ac2f0b3240cb427d51cfeceb79dab91a7f5c9" graalVmSha256-linux-aarch64 = "771b308852853cf93f7a3fc429741dd17502b8c5fa91930de6af8ded461e2dc3" -graalVmSha256-windows-x64 = "06f0edb4d7e6c0063ca0db696538652bbd3983b81f264171da2961873c5e9e6d" +graalVmSha256-windows-x64 = "d5784cbdc87f84b5cbd6c9d09c6f1d4611954f139fcfc795005c58dffd7f6b41" ideaExtPlugin = "1.1.9" javaPoet = "0.+" javaxInject = "1"