root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x 

Closes gh-37529
This commit is contained in:
Moritz Halbritter 2023-09-22 09:11:47 +02:00
parent e98b78994d a8fcb18471
commit f7ec5f6b1a
4 changed files with 2 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ci/images/ci-image-jdk20/Dockerfile
View File

@ -1,11 +0,0 @@
FROM ubuntu:jammy-20230816
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
ADD get-docker-url.sh /get-docker-url.sh
ADD get-docker-compose-url.sh /get-docker-compose-url.sh
RUN ./setup.sh java17 java20
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh

3
ci/images/get-jdk-url.sh
View File

@ -5,9 +5,6 @@ case "$1" in
java17)
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz"
;;
java20)
echo "https://github.com/bell-sw/Liberica/releases/download/20.0.2+10/bellsoft-jdk20.0.2+10-linux-amd64.tar.gz"
;;
java21)
echo "https://github.com/bell-sw/Liberica/releases/download/21+37/bellsoft-jdk21+37-linux-amd64.tar.gz"
;;

95
ci/pipeline.yml
View File

@ -169,12 +169,6 @@ resources:
source:
<<: *ci-registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci
- name: ci-image-jdk20
type: registry-image
icon: docker
source:
<<: *ci-registry-image-resource-source
repository: ((docker-hub-organization))/spring-boot-ci-jdk20
- name: ci-image-jdk21
type: registry-image
icon: docker
@ -205,14 +199,6 @@ resources:
access_token: ((github-ci-status-token))
branch: ((branch))
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: repo-status-jdk21-build
type: github-status-resource
icon: eye-check-outline
@ -256,13 +242,6 @@ jobs:
image: ci-image
vars:
ci-image-name: ci-image
- task: build-ci-image-jdk20
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
output_mapping:
image: ci-image-jdk20
vars:
ci-image-name: ci-image-jdk20
- task: build-ci-image-jdk21
privileged: true
file: git-repo/ci/tasks/build-ci-image.yml
@ -274,9 +253,6 @@ jobs:
- put: ci-image
params:
image: ci-image/image.tar
- put: ci-image-jdk20
params:
image: ci-image-jdk20/image.tar
- put: ci-image-jdk21
params:
image: ci-image-jdk21/image.tar
@ -293,12 +269,6 @@ 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
- task: detect-jdk21-update
image: ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml
@ -364,38 +334,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk20-build
serial: true
public: true
plan:
- get: ci-image-jdk20
- get: git-repo
trigger: true
- put: repo-status-jdk20-build
params: { state: "pending", commit: "git-repo" }
- do:
- task: build-project
image: ci-image-jdk20
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/build-project.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 20
<<: *gradle-enterprise-task-params
<<: *docker-hub-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" }
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk21-build
serial: true
public: true
@ -698,35 +636,6 @@ jobs:
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk20-run-system-tests
serial: true
public: true
plan:
- get: ci-image-jdk20
- get: git-repo
- get: paketo-builder-base-image
trigger: true
- get: daily
trigger: true
- do:
- task: run-system-tests
image: ci-image-jdk20
privileged: true
timeout: ((task-timeout))
file: git-repo/ci/tasks/run-system-tests.yml
params:
BRANCH: ((branch))
TOOLCHAIN_JAVA_VERSION: 20
<<: *gradle-enterprise-task-params
<<: *docker-hub-task-params
on_failure:
do:
- put: slack-alert
params:
<<: *slack-fail-params
- put: slack-alert
params:
<<: *slack-success-params
- name: jdk21-run-system-tests
serial: true
public: true
@ -758,11 +667,11 @@ jobs:
<<: *slack-success-params
groups:
- name: "builds"
jobs: ["build", "jdk20-build", "jdk21-build", "windows-build"]
jobs: ["build", "jdk21-build", "windows-build"]
- name: "releases"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release", "publish-gradle-plugin", "publish-to-sdkman", "update-homebrew-tap"]
- name: "system-tests"
jobs: ["run-system-tests", "jdk20-run-system-tests", "jdk21-run-system-tests"]
jobs: ["run-system-tests", "jdk21-run-system-tests"]
- name: "ci-images"
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]

4
ci/scripts/detect-jdk-updates.sh
View File

@ -12,10 +12,6 @@ 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 and .sdkmanrc"
;;
java20)
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=20"
ISSUE_TITLE="Upgrade Java 20 version in CI image"
;;
java21)
BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=21"
ISSUE_TITLE="Upgrade Java 21 version in CI image"