Browse Source

Remove JDK 20 variant from CI build.

pull/32145/head
Brian Clozel 2 years ago
parent
commit
d756c2b128
  1. 1
      ci/images/ci-image/Dockerfile
  2. 2
      ci/images/setup.sh
  3. 45
      ci/pipeline.yml
  4. 2
      ci/scripts/check-project.sh

1
ci/images/ci-image/Dockerfile

@ -6,6 +6,5 @@ RUN ./setup.sh
ENV JAVA_HOME /opt/openjdk/java17 ENV JAVA_HOME /opt/openjdk/java17
ENV JDK17 /opt/openjdk/java17 ENV JDK17 /opt/openjdk/java17
ENV JDK20 /opt/openjdk/java20
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

2
ci/images/setup.sh

@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
mkdir -p /opt/openjdk mkdir -p /opt/openjdk
pushd /opt/openjdk > /dev/null pushd /opt/openjdk > /dev/null
for jdk in java17 java20 for jdk in java17
do do
JDK_URL=$( /get-jdk-url.sh $jdk ) JDK_URL=$( /get-jdk-url.sh $jdk )
mkdir $jdk mkdir $jdk

45
ci/pipeline.yml

@ -90,13 +90,6 @@ resources:
<<: *docker-resource-source <<: *docker-resource-source
repository: ((docker-hub-organization))/spring-framework-ci repository: ((docker-hub-organization))/spring-framework-ci
tag: ((milestone)) tag: ((milestone))
- name: every-morning
type: time
icon: alarm
source:
start: 8:00 AM
stop: 9:00 AM
location: Europe/Vienna
- name: artifactory-repo - name: artifactory-repo
type: artifactory-resource type: artifactory-resource
icon: package-variant icon: package-variant
@ -113,14 +106,6 @@ resources:
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: build context: build
- name: repo-status-jdk20-build
type: github-status-resource
icon: eye-check-outline
source:
repository: ((github-repo-name))
access_token: ((github-ci-status-token))
branch: ((branch))
context: jdk20-build
- name: slack-alert - name: slack-alert
type: slack-notification type: slack-notification
icon: slack icon: slack
@ -217,34 +202,6 @@ jobs:
"zip.type": "schema" "zip.type": "schema"
get_params: get_params:
threads: 8 threads: 8
- name: jdk20-build
serial: true
public: true
plan:
- get: ci-image
- get: git-repo
- get: every-morning
trigger: true
- put: repo-status-jdk20-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: 20
<<: *build-project-task-params
on_failure:
do:
- put: repo-status-jdk20-build
params: { state: "failure", commit: "git-repo" }
- put: slack-alert
params:
<<: *slack-fail-params
- put: repo-status-jdk20-build
params: { state: "success", commit: "git-repo" }
- name: stage-milestone - name: stage-milestone
serial: true serial: true
plan: plan:
@ -396,7 +353,7 @@ jobs:
groups: groups:
- name: "builds" - name: "builds"
jobs: ["build", "jdk20-build"] jobs: ["build"]
- name: "releases" - name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"] jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
- name: "ci-images" - name: "ci-images"

2
ci/scripts/check-project.sh

@ -4,6 +4,6 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
pushd git-repo > /dev/null pushd git-repo > /dev/null
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK20 \ ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17 \
-PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora
popd > /dev/null popd > /dev/null

Loading…
Cancel
Save