Skip to content

Commit

Permalink
chore(ci): Mergify - merge Autobumps on release-* (spinnaker#1018) (s…
Browse files Browse the repository at this point in the history
…pinnaker#1022)

And request review for failed autobump builds on master and release branches.

Lastly, remove Travis CI related rule. It's not used.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit e4fc102)

Co-authored-by: kskewes-sf <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mergify[bot] and kskewes-sf authored Apr 27, 2022
1 parent 5cbe4d7 commit 7c3979e
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,6 @@ pull_request_rules:
name: default
label:
add: ["auto merged"]
# This rule exists to handle release branches that are still building using Travis CI instead of
# using Github actions. It can be deleted once all active release branches are running Github actions.
- name: Automatically merge release branch changes on Travis CI success and release manager review
conditions:
- base~=^release-
- status-success=continuous-integration/travis-ci/pr
- "label=ready to merge"
- "approved-reviews-by=@release-managers"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically merge PRs from maintainers on CI success and review
conditions:
- base=master
Expand All @@ -56,7 +42,7 @@ pull_request_rules:
add: ["auto merged"]
- name: Automatically merge autobump PRs on CI success
conditions:
- base=master
- base~=^(master|release-)
- status-success=build
- "label~=autobump-*"
- "author:spinnakerbot"
Expand All @@ -68,7 +54,7 @@ pull_request_rules:
add: ["auto merged"]
- name: Request reviews for autobump PRs on CI failure
conditions:
- base=master
- base~=^(master|release-)
- status-failure=build
- "label~=autobump-*"
- base=master
Expand Down

0 comments on commit 7c3979e

Please sign in to comment.