Merge branch '2.1.x'

Closes gh-18116
This commit is contained in:
Phillip Webb 2019-09-03 16:12:55 -07:00
commit 4fa41054d5
1 changed files with 17 additions and 16 deletions

View File

@ -162,22 +162,23 @@ jobs:
plan: plan:
- get: ci-images-git-repo - get: ci-images-git-repo
trigger: true trigger: true
- put: spring-boot-ci-image - in_parallel:
params: - put: spring-boot-ci-image
build: ci-images-git-repo/ci/images params:
dockerfile: ci-images-git-repo/ci/images/spring-boot-ci-image/Dockerfile build: ci-images-git-repo/ci/images
- put: spring-boot-jdk11-ci-image dockerfile: ci-images-git-repo/ci/images/spring-boot-ci-image/Dockerfile
params: - put: spring-boot-jdk11-ci-image
build: ci-images-git-repo/ci/images params:
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile build: ci-images-git-repo/ci/images
- put: spring-boot-jdk12-ci-image dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
params: - put: spring-boot-jdk12-ci-image
build: ci-images-git-repo/ci/images params:
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile build: ci-images-git-repo/ci/images
- put: spring-boot-jdk13-ci-image dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk12-ci-image/Dockerfile
params: - put: spring-boot-jdk13-ci-image
build: ci-images-git-repo/ci/images params:
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk13-ci-image/Dockerfile build: ci-images-git-repo/ci/images
dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk13-ci-image/Dockerfile
- name: detect-jdk-updates - name: detect-jdk-updates
plan: plan:
- get: git-repo - get: git-repo