Skip to content
This repository was archived by the owner on Dec 20, 2025. It is now read-only.

Commit 17b0a94

Browse files
chore(ci): Mergify - merge Autobumps on release-* (#2034) (#2037)
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 04f77fb) Co-authored-by: kskewes-sf <96093759+kskewes-sf@users.noreply.github.com>
1 parent 749a565 commit 17b0a94

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

.mergify.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,6 @@ pull_request_rules:
2323
strict: smart
2424
label:
2525
add: ["auto merged"]
26-
# This rule exists to handle release branches that are still building using Travis CI instead of
27-
# using Github actions. It can be deleted once all active release branches are running Github actions.
28-
- name: Automatically merge release branch changes on Travis CI success and release manager review
29-
conditions:
30-
- base~=^release-
31-
- status-success=continuous-integration/travis-ci/pr
32-
- "label=ready to merge"
33-
- "approved-reviews-by=@release-managers"
34-
actions:
35-
merge:
36-
method: squash
37-
strict: smart
38-
label:
39-
add: ["auto merged"]
4026
- name: Automatically merge PRs from maintainers on CI success and review
4127
conditions:
4228
- base=master
@@ -51,7 +37,7 @@ pull_request_rules:
5137
add: ["auto merged"]
5238
- name: Automatically merge autobump PRs on CI success
5339
conditions:
54-
- base=master
40+
- base~=^(master|release-)
5541
- status-success=build
5642
- "label~=autobump-*"
5743
- "author:spinnakerbot"
@@ -63,7 +49,7 @@ pull_request_rules:
6349
add: ["auto merged"]
6450
- name: Request reviews for autobump PRs on CI failure
6551
conditions:
66-
- base=master
52+
- base~=^(master|release-)
6753
- status-failure=build
6854
- "label~=autobump-*"
6955
- base=master

0 commit comments

Comments
 (0)