Skip to content

Commit

Permalink
Revert CI changes as its not about building on jdk 17 but using jdk 17
Browse files Browse the repository at this point in the history
  • Loading branch information
StefMa authored Feb 29, 2024
1 parent 920a4a5 commit 8bd04e2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,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
}
}
Expand Down
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ jobs:
steps:
- checkout
- run:
command: ./gradlew --info --stacktrace check -PPKL_JVM_VERSION=11
command: ./gradlew --info --stacktrace check
name: gradle check
- run:
command: |-
Expand All @@ -596,12 +596,12 @@ jobs:
environment:
LANG: en_US.UTF-8
docker:
- image: cimg/openjdk:8.0
- image: cimg/openjdk:11.0
gradle-check-jdk17:
steps:
- checkout
- run:
command: ./gradlew --info --stacktrace check -PPKL_JVM_VERSION=17
command: ./gradlew --info --stacktrace check
name: gradle check
- run:
command: |-
Expand All @@ -614,7 +614,7 @@ jobs:
environment:
LANG: en_US.UTF-8
docker:
- image: cimg/openjdk:8.0
- image: cimg/openjdk:17.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"|"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"
}
}

job {
docker {
new {
image = "cimg/openjdk:8.0"
image = "cimg/openjdk:\(javaVersion)"
}
}
}

0 comments on commit 8bd04e2

Please sign in to comment.