diff --git a/.circleci/config.pkl b/.circleci/config.pkl index f35042a5e..cb892d73b 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -141,11 +141,11 @@ local buildNativeJobs: Mapping = new { local gradleCheckJobs: Mapping = new { ["gradle-check-jdk11"] { - javaVersion = "11.0" + javaVersion = "11" isRelease = false } ["gradle-check-jdk17"] { - javaVersion = "17.0" + javaVersion = "17" isRelease = false } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c8a6c4df..7ccbb9218 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -614,7 +614,7 @@ jobs: environment: LANG: en_US.UTF-8 docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:11.0 bench: steps: - checkout diff --git a/.circleci/jobs/GradleCheckJob.pkl b/.circleci/jobs/GradleCheckJob.pkl index fcbfb3a54..64a2b5880 100644 --- a/.circleci/jobs/GradleCheckJob.pkl +++ b/.circleci/jobs/GradleCheckJob.pkl @@ -17,19 +17,19 @@ extends "GradleJob.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" -javaVersion: "11.0"|"17.0" +javaVersion: "11"|"17" steps { new Config.RunStep { name = "gradle check" - command = "./gradlew \(module.gradleArgs) check -DPKL_JVM_VERSION=\(javaVersion.dropLast(2))" + command = "./gradlew \(module.gradleArgs) check -DPKL_JVM_VERSION=\(javaVersion)" } } job { docker { new { - image = "cimg/openjdk:\(javaVersion)" + image = "cimg/openjdk:11.0" } } }