Skip to content

Commit 63e2040

Browse files
committed
Configure JDK 21 CI build
This commit replaces the JDK 20 compatibility build with a JDK 21 (early access) variant. See gh-30339
1 parent 5c574b9 commit 63e2040

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

ci/images/ci-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ RUN ./setup.sh
66

77
ENV JAVA_HOME /opt/openjdk/java17
88
ENV JDK17 /opt/openjdk/java17
9-
ENV JDK20 /opt/openjdk/java20
9+
ENV JDK21 /opt/openjdk/java20
1010

1111
ENV PATH $JAVA_HOME/bin:$PATH

ci/images/get-jdk-url.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ case "$1" in
88
java20)
99
echo "https://github.com/bell-sw/Liberica/releases/download/20%2B37/bellsoft-jdk20+37-linux-amd64.tar.gz"
1010
;;
11+
java21)
12+
echo "https://download.java.net/java/early_access/jdk21/18/GPL/openjdk-21-ea+18_linux-x64_bin.tar.gz"
13+
;;
1114
*)
1215
echo $"Unknown java version"
1316
exit 1

ci/pipeline.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ resources:
127127
access_token: ((github-ci-status-token))
128128
branch: ((branch))
129129
context: build
130-
- name: repo-status-jdk20-build
130+
- name: repo-status-jdk21-build
131131
type: github-status-resource
132132
icon: eye-check-outline
133133
source:
134134
repository: ((github-repo-name))
135135
access_token: ((github-ci-status-token))
136136
branch: ((branch))
137-
context: jdk20-build
137+
context: jdk21-build
138138
- name: slack-alert
139139
type: slack-notification
140140
icon: slack
@@ -231,15 +231,15 @@ jobs:
231231
"zip.type": "schema"
232232
get_params:
233233
threads: 8
234-
- name: jdk20-build
234+
- name: jdk21-build
235235
serial: true
236236
public: true
237237
plan:
238238
- get: ci-image
239239
- get: git-repo
240240
- get: every-morning
241241
trigger: true
242-
- put: repo-status-jdk20-build
242+
- put: repo-status-jdk21-build
243243
params: { state: "pending", commit: "git-repo" }
244244
- do:
245245
- task: check-project
@@ -248,16 +248,16 @@ jobs:
248248
privileged: true
249249
timeout: ((task-timeout))
250250
params:
251-
TEST_TOOLCHAIN: 20
251+
TEST_TOOLCHAIN: 21
252252
<<: *build-project-task-params
253253
on_failure:
254254
do:
255-
- put: repo-status-jdk20-build
255+
- put: repo-status-jdk21-build
256256
params: { state: "failure", commit: "git-repo" }
257257
- put: slack-alert
258258
params:
259259
<<: *slack-fail-params
260-
- put: repo-status-jdk20-build
260+
- put: repo-status-jdk21-build
261261
params: { state: "success", commit: "git-repo" }
262262
- name: build-pull-requests
263263
serial: true
@@ -441,7 +441,7 @@ jobs:
441441

442442
groups:
443443
- name: "builds"
444-
jobs: ["build", "jdk20-build"]
444+
jobs: ["build", "jdk21-build"]
445445
- name: "releases"
446446
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
447447
- name: "ci-images"

ci/scripts/check-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -e
44
source $(dirname $0)/common.sh
55

66
pushd git-repo > /dev/null
7-
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK20 \
7+
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21 \
88
-PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
99
popd > /dev/null

0 commit comments

Comments
 (0)