root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source
pull/23585/head
Phillip Webb 4 years ago
parent 0963218be1 e6ebcf1429
commit b59b28767b
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
ci/images/spring-boot-jdk14-ci-image/Dockerfile → ci/images/spring-boot-jdk15-ci-image/Dockerfile
Unescape Escape View File

@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200807
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
ADD get-docker-url.sh /get-docker-url.sh ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java14 RUN ./setup.sh java15
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

30
ci/pipeline.yml
Unescape Escape View File

@ -144,12 +144,12 @@ resources:
source: source:
<<: *docker-resource-source <<: *docker-resource-source
repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
- name: spring-boot-jdk14-ci-image - name: spring-boot-jdk15-ci-image
type: docker-image type: docker-image
icon: docker icon: docker
source: source:
<<: *docker-resource-source <<: *docker-resource-source
repository: ((docker-hub-organization))/spring-boot-jdk14-ci-image repository: ((docker-hub-organization))/spring-boot-jdk15-ci-image
- name: artifactory-repo - name: artifactory-repo
type: artifactory-resource type: artifactory-resource
icon: package-variant icon: package-variant
@ -174,14 +174,14 @@ resources:
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: jdk11-build context: jdk11-build
- name: repo-status-jdk14-build - name: repo-status-jdk15-build
type: github-status-resource type: github-status-resource
icon: eye-check-outline icon: eye-check-outline
source: source:
repository: ((github-repo-name)) repository: ((github-repo-name))
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: jdk14-build context: jdk15-build
- name: slack-alert - name: slack-alert
type: slack-notification type: slack-notification
icon: slack icon: slack
@ -212,10 +212,10 @@ jobs:
params: params:
build: ci-images-git-repo/ci/images build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
- put: spring-boot-jdk14-ci-image - put: spring-boot-jdk15-ci-image
params: params:
build: ci-images-git-repo/ci/images build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk15-ci-image/Dockerfile
- name: detect-jdk-updates - name: detect-jdk-updates
plan: plan:
- get: git-repo - get: git-repo
@ -235,12 +235,12 @@ jobs:
params: params:
<<: *github-task-params <<: *github-task-params
JDK_VERSION: java11 JDK_VERSION: java11
- task: detect-jdk14-update - task: detect-jdk15-update
image: spring-boot-ci-image image: spring-boot-ci-image
file: git-repo/ci/tasks/detect-jdk-updates.yml file: git-repo/ci/tasks/detect-jdk-updates.yml
params: params:
<<: *github-task-params <<: *github-task-params
JDK_VERSION: java14 JDK_VERSION: java15
- name: detect-ubuntu-image-updates - name: detect-ubuntu-image-updates
plan: plan:
- get: git-repo - get: git-repo
@ -353,27 +353,27 @@ jobs:
- put: slack-alert - put: slack-alert
params: params:
<<: *slack-success-params <<: *slack-success-params
- name: jdk14-build - name: jdk15-build
serial: true serial: true
public: true public: true
plan: plan:
- get: spring-boot-jdk14-ci-image - get: spring-boot-jdk15-ci-image
- get: git-repo - get: git-repo
trigger: true trigger: true
- put: repo-status-jdk14-build - put: repo-status-jdk15-build
params: { state: "pending", commit: "git-repo" } params: { state: "pending", commit: "git-repo" }
- do: - do:
- task: build-project - task: build-project
image: spring-boot-jdk14-ci-image image: spring-boot-jdk15-ci-image
<<: *build-project-task-params <<: *build-project-task-params
on_failure: on_failure:
do: do:
- put: repo-status-jdk14-build - put: repo-status-jdk15-build
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
<<: *slack-fail-params <<: *slack-fail-params
- put: repo-status-jdk14-build - put: repo-status-jdk15-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
@ -567,7 +567,7 @@ jobs:
body: generated-release-notes/release-notes.md body: generated-release-notes/release-notes.md
groups: groups:
- name: "Build" - name: "Build"
jobs: ["build", "jdk11-build", "jdk14-build", "windows-build"] jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
- name: "Release" - name: "Release"
jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"] jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
- name: "CI Images" - name: "CI Images"

Write Preview
Loading…
Cancel
Save