From 17a4d303f852754c0d40df51e35f38cab72cd97a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 24 Mar 2023 15:59:45 +0000 Subject: [PATCH] Switch Java 20 CI to Bellsoft Liberica Closes gh-34752 --- ci/images/get-jdk-url.sh | 2 +- ci/pipeline.yml | 6 ++++++ ci/scripts/detect-jdk-updates.sh | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 2c2c71362ab..60b50def350 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz" ;; java20) - echo "https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/20+37/bellsoft-jdk20+37-linux-amd64.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 0cc77b5f655..b45dc905750 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -342,6 +342,12 @@ jobs: params: <<: *github-task-params JDK_VERSION: java17 + - task: detect-jdk20-update + image: ci-image + file: git-repo/ci/tasks/detect-jdk-updates.yml + params: + <<: *github-task-params + JDK_VERSION: java20 - name: detect-ubuntu-image-updates plan: - get: git-repo diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index bb53eedced1..02aaec78c11 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -20,6 +20,10 @@ case "$JDK_VERSION" in BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17" ISSUE_TITLE="Upgrade Java 17 version in CI image" ;; + java20) + BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=20" + ISSUE_TITLE="Upgrade Java 20 version in CI image" + ;; *) echo $"Unknown java version" exit 1;