Skip to content

Commit 6712dfc

Browse files
link108Cameron Motevasselani
authored andcommitted
chore(build): update mergify config (#982)
Co-authored-by: Cameron Motevasselani <[email protected]> (cherry picked from commit f981115)
1 parent 6cdf294 commit 6712dfc

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.mergify.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
queue_rules:
2+
- name: default
3+
conditions:
4+
- status-success=build
5+
16
pull_request_rules:
27
- name: Automatically merge on CI success and review
38
conditions:
@@ -6,9 +11,9 @@ pull_request_rules:
611
- "label=ready to merge"
712
- "approved-reviews-by=@oss-approvers"
813
actions:
9-
merge:
14+
queue:
1015
method: squash
11-
strict: smart
16+
name: default
1217
label:
1318
add: ["auto merged"]
1419
- name: Automatically merge release branch changes on CI success and release manager review
@@ -18,9 +23,9 @@ pull_request_rules:
1823
- "label=ready to merge"
1924
- "approved-reviews-by=@release-managers"
2025
actions:
21-
merge:
26+
queue:
2227
method: squash
23-
strict: smart
28+
name: default
2429
label:
2530
add: ["auto merged"]
2631
# This rule exists to handle release branches that are still building using Travis CI instead of
@@ -32,9 +37,9 @@ pull_request_rules:
3237
- "label=ready to merge"
3338
- "approved-reviews-by=@release-managers"
3439
actions:
35-
merge:
40+
queue:
3641
method: squash
37-
strict: smart
42+
name: default
3843
label:
3944
add: ["auto merged"]
4045
- name: Automatically merge PRs from maintainers on CI success and review
@@ -44,9 +49,9 @@ pull_request_rules:
4449
- "label=ready to merge"
4550
- "author=@oss-approvers"
4651
actions:
47-
merge:
52+
queue:
4853
method: squash
49-
strict: smart
54+
name: default
5055
label:
5156
add: ["auto merged"]
5257
- name: Automatically merge autobump PRs on CI success
@@ -56,9 +61,9 @@ pull_request_rules:
5661
- "label~=autobump-*"
5762
- "author:spinnakerbot"
5863
actions:
59-
merge:
64+
queue:
6065
method: squash
61-
strict: smart
66+
name: default
6267
label:
6368
add: ["auto merged"]
6469
- name: Request reviews for autobump PRs on CI failure

0 commit comments

Comments
 (0)