Skip to content

Commit

Permalink
Update CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
StefMa committed Mar 20, 2024
1 parent cffa8e0 commit 5b2e95b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ local buildNativeJobs: Mapping<String, BuildNativeJob> = new {

local gradleCheckJobs: Mapping<String, GradleCheckJob> = new {
["gradle-check-jdk11"] {
javaVersion = "11.0"
javaVersion = "11"
isRelease = false
}
["gradle-check-jdk17"] {
javaVersion = "17.0"
javaVersion = "17"
isRelease = false
}
}
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .circleci/jobs/GradleCheckJob.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ extends "GradleJob.pkl"

import "package://pkg.pkl-lang.org/pkl-pantry/[email protected]#/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"
}
}
}

0 comments on commit 5b2e95b

Please sign in to comment.