Skip to content

Commit d4ef5dc

Browse files
committed
Merge branch '2.7.x' into 3.0.x
Closes gh-34755
2 parents 1933e9a + 17a4d30 commit d4ef5dc

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

ci/images/get-jdk-url.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ case "$1" in
66
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
77
;;
88
java20)
9-
echo "https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz"
9+
echo "https://github.com/bell-sw/Liberica/releases/download/20+37/bellsoft-jdk20+37-linux-amd64.tar.gz"
1010
;;
1111
*)
1212
echo $"Unknown java version"

ci/pipeline.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ jobs:
282282
params:
283283
<<: *github-task-params
284284
JDK_VERSION: java17
285+
- task: detect-jdk20-update
286+
image: ci-image
287+
file: git-repo/ci/tasks/detect-jdk-updates.yml
288+
params:
289+
<<: *github-task-params
290+
JDK_VERSION: java20
285291
- name: detect-ubuntu-image-updates
286292
plan:
287293
- get: git-repo

ci/scripts/detect-jdk-updates.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ case "$JDK_VERSION" in
1212
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17"
1313
ISSUE_TITLE="Upgrade Java 17 version in CI image and .sdkmanrc"
1414
;;
15+
java20)
16+
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=20"
17+
ISSUE_TITLE="Upgrade Java 20 version in CI image"
18+
;;
1519
*)
1620
echo $"Unknown java version"
1721
exit 1;

0 commit comments

Comments
 (0)