Fix CI build for different jdk versions

apple · Feb 28, 2024 · ad2fe32 · ad2fe32
1 parent d012312
commit ad2fe32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.pkl b/.circleci/config.pkl
@@ -97,11 +97,11 @@ local buildNativeJobs: Mapping<String, BuildNativeJob> = new {
 
 local gradleCheckJobs: Mapping<String, GradleCheckJob> = 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
@@ -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
@@ -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))"
   }
 }