From ad2fe326c0f9264735d29ebc7f9bfa6f0ebda38b Mon Sep 17 00:00:00 2001 From: Stefan M Date: Wed, 28 Feb 2024 20:43:42 +0000 Subject: [PATCH] Fix CI build for different jdk versions --- .circleci/config.pkl | 4 ++-- .circleci/config.yml | 4 ++-- .circleci/jobs/GradleCheckJob.pkl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index ae217ff4f..bf1f55f96 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -97,11 +97,11 @@ local buildNativeJobs: Mapping = new { local gradleCheckJobs: Mapping = new { ["gradle-check-jdk11"] { - javaVersion = "11" + javaVersion = "11.0" isRelease = false } ["gradle-check-jdk17"] { - javaVersion = "17" + javaVersion = "17.0" isRelease = false } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 58e76a708..773ecd84f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -583,7 +583,7 @@ jobs: steps: - checkout - run: - command: ./gradlew --info --stacktrace check + command: ./gradlew --info --stacktrace check -PPKL_JVM_VERSION=11 name: gradle check - run: command: |- @@ -601,7 +601,7 @@ jobs: steps: - checkout - run: - command: ./gradlew --info --stacktrace check + command: ./gradlew --info --stacktrace check -PPKL_JVM_VERSION=17 name: gradle check - run: command: |- diff --git a/.circleci/jobs/GradleCheckJob.pkl b/.circleci/jobs/GradleCheckJob.pkl index c4a98023d..099848407 100644 --- a/.circleci/jobs/GradleCheckJob.pkl +++ b/.circleci/jobs/GradleCheckJob.pkl @@ -17,12 +17,12 @@ extends "GradleJob.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" -javaVersion: "11"|"17" +javaVersion: "11.0"|"17.0" steps { new Config.RunStep { name = "gradle check" - command = "./gradlew \(module.gradleArgs) check -PPKL_JVM_VERSION=\(javaVersion)" + command = "./gradlew \(module.gradleArgs) check -PPKL_JVM_VERSION=\(javaVersion.dropLast(2))" } }