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

Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Phillip Webb 2019-08-01 10:50:31 +01:00
parent 96235ea674 e26777c014
commit bd815f6b5a
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/parameters.yml
View File

@ -11,3 +11,4 @@ pipeline-name: "spring-boot-2.1.x"
concourse-url: "https://ci.spring.io"
bintray-subject: "spring"
bintray-repo: "jars"
task-timeout: 2h00m

30
ci/pipeline.yml
View File

@ -202,20 +202,20 @@ jobs:
- do:
- task: build-project
privileged: true
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-project.yml
- in_parallel:
- task: build-samples
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure:
@ -274,20 +274,20 @@ jobs:
path: git-repo
status: pending
- task: build-project
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-pr-project.yml
- in_parallel:
- task: build-samples
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_success:
@ -312,12 +312,12 @@ jobs:
- do:
- task: build-project
privileged: true
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-project.yml
- in_parallel:
- task: build-samples
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk11-ci-image
file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests
@ -358,20 +358,20 @@ jobs:
- do:
- task: build-project
privileged: true
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-project.yml
- in_parallel:
- task: build-samples
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-samples.yml
- task: build-integration-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-integration-tests.yml
- task: build-deployment-tests
timeout: 1h30m
timeout: ((task-timeout))
image: spring-boot-jdk12-ci-image
file: git-repo/ci/tasks/build-deployment-tests.yml
on_failure:
@ -405,7 +405,7 @@ jobs:
file: git-repo/ci/tasks/build-project-windows.yml
tags:
- WIN64
timeout: 1h30m
timeout: ((task-timeout))
on_failure:
do:
- put: slack-alert