From e725e3a51b4f5398801c1448ba03af1145594730 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 19 Jan 2023 09:40:25 +0100 Subject: [PATCH] Update Java versions and remove Java 18 build --- ci/images/ci-image/Dockerfile | 1 - ci/images/get-jdk-url.sh | 7 ++----- ci/pipeline.yml | 38 +---------------------------------- ci/scripts/check-project.sh | 2 +- gradle/toolchains.gradle | 8 ++++---- 5 files changed, 8 insertions(+), 48 deletions(-) diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index cfb4fcb479a..91505bc3e10 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -6,7 +6,6 @@ RUN ./setup.sh ENV JAVA_HOME /opt/openjdk/java17 ENV JDK17 /opt/openjdk/java17 -ENV JDK18 /opt/openjdk/java18 ENV JDK19 /opt/openjdk/java19 ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 6bf03457942..cf7bd8210a8 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,13 +3,10 @@ set -e case "$1" in java17) - echo "https://github.com/bell-sw/Liberica/releases/download/17.0.5+8/bellsoft-jdk17.0.5+8-linux-amd64.tar.gz" - ;; - java18) - echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1%2B1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz" ;; java19) - echo "https://github.com/bell-sw/Liberica/releases/download/19.0.1%2B11/bellsoft-jdk19.0.1+11-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 51166cfbf58..2822ab48eae 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -125,14 +125,6 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: build -- name: repo-status-jdk18-build - type: github-status-resource - icon: eye-check-outline - source: - repository: ((github-repo-name)) - access_token: ((github-ci-status-token)) - branch: ((branch)) - context: jdk18-build - name: repo-status-jdk19-build type: github-status-resource icon: eye-check-outline @@ -237,34 +229,6 @@ jobs: "zip.type": "schema" get_params: threads: 8 -- name: jdk18-build - serial: true - public: true - plan: - - get: ci-image - - get: git-repo - - get: every-morning - trigger: true - - put: repo-status-jdk18-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: check-project - image: ci-image - file: git-repo/ci/tasks/check-project.yml - privileged: true - timeout: ((task-timeout)) - params: - TEST_TOOLCHAIN: 18 - <<: *build-project-task-params - on_failure: - do: - - put: repo-status-jdk18-build - params: { state: "failure", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-fail-params - - put: repo-status-jdk18-build - params: { state: "success", commit: "git-repo" } - name: jdk19-build serial: true public: true @@ -471,7 +435,7 @@ jobs: groups: - name: "builds" - jobs: ["build", "jdk18-build", "jdk19-build"] + jobs: ["build", "jdk19-build"] - name: "releases" jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"] - name: "ci-images" diff --git a/ci/scripts/check-project.sh b/ci/scripts/check-project.sh index c0b66efc7d3..2de41f7869d 100755 --- a/ci/scripts/check-project.sh +++ b/ci/scripts/check-project.sh @@ -4,6 +4,6 @@ set -e source $(dirname $0)/common.sh pushd git-repo > /dev/null -./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 \ +./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK19 \ -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check popd > /dev/null diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle index f7eaeb8c2f4..88ce8032689 100644 --- a/gradle/toolchains.gradle +++ b/gradle/toolchains.gradle @@ -5,10 +5,10 @@ * One can choose the toolchain to use for compiling the MAIN sources and/or compiling * and running the TEST sources. These options apply to Java, Kotlin and Groovy sources * when available. - * {@code "./gradlew check -PmainToolchain=17 -PtestToolchain=18"} will use: + * {@code "./gradlew check -PmainToolchain=17 -PtestToolchain=19"} will use: * * * By default, the build will fall back to using the current JDK and 17 language level for all sourceSets. @@ -23,9 +23,9 @@ * {@code * $ echo JDK17 * /opt/openjdk/java17 - * $ echo JDK18 + * $ echo JDK19 * /opt/openjdk/java18 - * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 check + * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK17,JDK19 check * } * * @author Brian Clozel