Skip to content

Commit d756c2b

Browse files
committed
Remove JDK 20 variant from CI build.
1 parent 3be4322 commit d756c2b

File tree

4 files changed

+3
-47
lines changed

4 files changed

+3
-47
lines changed

ci/images/ci-image/Dockerfile

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

77
ENV JAVA_HOME /opt/openjdk/java17
88
ENV JDK17 /opt/openjdk/java17
9-
ENV JDK20 /opt/openjdk/java20
109

1110
ENV PATH $JAVA_HOME/bin:$PATH

ci/images/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
2020

2121
mkdir -p /opt/openjdk
2222
pushd /opt/openjdk > /dev/null
23-
for jdk in java17 java20
23+
for jdk in java17
2424
do
2525
JDK_URL=$( /get-jdk-url.sh $jdk )
2626
mkdir $jdk

ci/pipeline.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@ resources:
9090
<<: *docker-resource-source
9191
repository: ((docker-hub-organization))/spring-framework-ci
9292
tag: ((milestone))
93-
- name: every-morning
94-
type: time
95-
icon: alarm
96-
source:
97-
start: 8:00 AM
98-
stop: 9:00 AM
99-
location: Europe/Vienna
10093
- name: artifactory-repo
10194
type: artifactory-resource
10295
icon: package-variant
@@ -113,14 +106,6 @@ resources:
113106
access_token: ((github-ci-status-token))
114107
branch: ((branch))
115108
context: build
116-
- name: repo-status-jdk20-build
117-
type: github-status-resource
118-
icon: eye-check-outline
119-
source:
120-
repository: ((github-repo-name))
121-
access_token: ((github-ci-status-token))
122-
branch: ((branch))
123-
context: jdk20-build
124109
- name: slack-alert
125110
type: slack-notification
126111
icon: slack
@@ -217,34 +202,6 @@ jobs:
217202
"zip.type": "schema"
218203
get_params:
219204
threads: 8
220-
- name: jdk20-build
221-
serial: true
222-
public: true
223-
plan:
224-
- get: ci-image
225-
- get: git-repo
226-
- get: every-morning
227-
trigger: true
228-
- put: repo-status-jdk20-build
229-
params: { state: "pending", commit: "git-repo" }
230-
- do:
231-
- task: check-project
232-
image: ci-image
233-
file: git-repo/ci/tasks/check-project.yml
234-
privileged: true
235-
timeout: ((task-timeout))
236-
params:
237-
TEST_TOOLCHAIN: 20
238-
<<: *build-project-task-params
239-
on_failure:
240-
do:
241-
- put: repo-status-jdk20-build
242-
params: { state: "failure", commit: "git-repo" }
243-
- put: slack-alert
244-
params:
245-
<<: *slack-fail-params
246-
- put: repo-status-jdk20-build
247-
params: { state: "success", commit: "git-repo" }
248205
- name: stage-milestone
249206
serial: true
250207
plan:
@@ -396,7 +353,7 @@ jobs:
396353

397354
groups:
398355
- name: "builds"
399-
jobs: ["build", "jdk20-build"]
356+
jobs: ["build"]
400357
- name: "releases"
401358
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
402359
- 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 \
88
-PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora
99
popd > /dev/null

0 commit comments

Comments
 (0)