From 8bd04e2c461c6d146109db0b6b21242b9c031167 Mon Sep 17 00:00:00 2001 From: Stefan M Date: Thu, 29 Feb 2024 15:07:39 +0000 Subject: [PATCH] Revert CI changes as its not about building on jdk 17 but using jdk 17 --- .circleci/config.pkl | 4 ++-- .circleci/config.yml | 8 ++++---- .circleci/jobs/GradleCheckJob.pkl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index ec28358aa..16719c3e7 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -99,11 +99,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 29662d7dd..6ce542fa3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: |- @@ -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: |- @@ -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 diff --git a/.circleci/jobs/GradleCheckJob.pkl b/.circleci/jobs/GradleCheckJob.pkl index 62a8b3af7..85ba84986 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.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" } } job { docker { new { - image = "cimg/openjdk:8.0" + image = "cimg/openjdk:\(javaVersion)" } } }