Skip to content

Commit 5d1fcfa

Browse files
committed
Merge branch '2.6.x' into 2.7.x
2 parents a5a5be3 + 12b09ac commit 5d1fcfa

File tree

1 file changed

+1
-44
lines changed

1 file changed

+1
-44
lines changed

ci/pipeline.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ resource_types:
107107
<<: *registry-image-resource-source
108108
repository: springio/artifactory-resource
109109
tag: 0.0.18
110-
- name: pull-request
111-
type: registry-image
112-
source:
113-
<<: *registry-image-resource-source
114-
repository: teliaoss/github-pr-resource
115-
tag: v0.23.0
116110
- name: github-status-resource
117111
type: registry-image
118112
source:
@@ -145,14 +139,6 @@ resources:
145139
git_config:
146140
- name: core.autocrlf
147141
value: true
148-
- name: git-pull-request
149-
type: pull-request
150-
icon: source-pull
151-
source:
152-
access_token: ((github-ci-pull-request-token))
153-
repository: ((github-repo-name))
154-
base_branch: ((branch))
155-
ignore_paths: ["ci/*"]
156142
- name: github-pre-release
157143
type: github-release
158144
icon: briefcase-download-outline
@@ -408,34 +394,6 @@ jobs:
408394
- put: slack-alert
409395
params:
410396
<<: *slack-success-params
411-
- name: build-pull-requests
412-
serial: true
413-
public: true
414-
plan:
415-
- get: ci-image
416-
- get: git-repo
417-
resource: git-pull-request
418-
trigger: true
419-
version: every
420-
- do:
421-
- put: git-pull-request
422-
params:
423-
path: git-repo
424-
status: pending
425-
- task: build-project
426-
image: ci-image
427-
file: git-repo/ci/tasks/build-pr-project.yml
428-
timeout: ((task-timeout))
429-
on_success:
430-
put: git-pull-request
431-
params:
432-
path: git-repo
433-
status: success
434-
on_failure:
435-
put: git-pull-request
436-
params:
437-
path: git-repo
438-
status: failure
439397
- name: jdk11-build
440398
serial: true
441399
public: true
@@ -881,5 +839,4 @@ groups:
881839
jobs: ["run-system-tests", "jdk11-run-system-tests", "jdk17-run-system-tests", "jdk20-run-system-tests"]
882840
- name: "ci-images"
883841
jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
884-
- name: "pull-requests"
885-
jobs: ["build-pull-requests"]
842+

0 commit comments

Comments
 (0)