mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.5.x' into 2.6.x
This commit is contained in:
commit
12b09acc87
@ -107,12 +107,6 @@ resource_types:
|
|||||||
<<: *registry-image-resource-source
|
<<: *registry-image-resource-source
|
||||||
repository: springio/artifactory-resource
|
repository: springio/artifactory-resource
|
||||||
tag: 0.0.18
|
tag: 0.0.18
|
||||||
- name: pull-request
|
|
||||||
type: registry-image
|
|
||||||
source:
|
|
||||||
<<: *registry-image-resource-source
|
|
||||||
repository: teliaoss/github-pr-resource
|
|
||||||
tag: v0.23.0
|
|
||||||
- name: github-status-resource
|
- name: github-status-resource
|
||||||
type: registry-image
|
type: registry-image
|
||||||
source:
|
source:
|
||||||
@ -145,14 +139,6 @@ resources:
|
|||||||
git_config:
|
git_config:
|
||||||
- name: core.autocrlf
|
- name: core.autocrlf
|
||||||
value: true
|
value: true
|
||||||
- name: git-pull-request
|
|
||||||
type: pull-request
|
|
||||||
icon: source-pull
|
|
||||||
source:
|
|
||||||
access_token: ((github-ci-pull-request-token))
|
|
||||||
repository: ((github-repo-name))
|
|
||||||
base_branch: ((branch))
|
|
||||||
ignore_paths: ["ci/*"]
|
|
||||||
- name: github-pre-release
|
- name: github-pre-release
|
||||||
type: github-release
|
type: github-release
|
||||||
icon: briefcase-download-outline
|
icon: briefcase-download-outline
|
||||||
@ -408,34 +394,6 @@ jobs:
|
|||||||
- put: slack-alert
|
- put: slack-alert
|
||||||
params:
|
params:
|
||||||
<<: *slack-success-params
|
<<: *slack-success-params
|
||||||
- name: build-pull-requests
|
|
||||||
serial: true
|
|
||||||
public: true
|
|
||||||
plan:
|
|
||||||
- get: ci-image
|
|
||||||
- get: git-repo
|
|
||||||
resource: git-pull-request
|
|
||||||
trigger: true
|
|
||||||
version: every
|
|
||||||
- do:
|
|
||||||
- put: git-pull-request
|
|
||||||
params:
|
|
||||||
path: git-repo
|
|
||||||
status: pending
|
|
||||||
- task: build-project
|
|
||||||
image: ci-image
|
|
||||||
file: git-repo/ci/tasks/build-pr-project.yml
|
|
||||||
timeout: ((task-timeout))
|
|
||||||
on_success:
|
|
||||||
put: git-pull-request
|
|
||||||
params:
|
|
||||||
path: git-repo
|
|
||||||
status: success
|
|
||||||
on_failure:
|
|
||||||
put: git-pull-request
|
|
||||||
params:
|
|
||||||
path: git-repo
|
|
||||||
status: failure
|
|
||||||
- name: jdk11-build
|
- name: jdk11-build
|
||||||
serial: true
|
serial: true
|
||||||
public: true
|
public: true
|
||||||
@ -881,5 +839,4 @@ groups:
|
|||||||
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk19-run-system-tests"]
|
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk19-run-system-tests"]
|
||||||
- name: "ci-images"
|
- name: "ci-images"
|
||||||
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
|
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
|
||||||
- name: "pull-requests"
|
|
||||||
jobs: ["build-pull-requests"]
|
|
||||||
|
Loading…
Reference in New Issue
Block a user