Skip to content

Commit 678ed95

Browse files
fix(mergify): use queue instead of merge (#1923)
1 parent 5164c16 commit 678ed95

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

.mergify.yml

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
queue_rules:
2+
- name: default
3+
conditions:
4+
- status-success=build
5+
- status-success=continuous-integration/travis-ci/pr
6+
- status-failure=build
7+
18
pull_request_rules:
29
- name: Automatically merge on CI success and review
310
conditions:
@@ -6,9 +13,9 @@ pull_request_rules:
613
- "label=ready to merge"
714
- "approved-reviews-by=@oss-approvers"
815
actions:
9-
merge:
16+
queue:
1017
method: squash
11-
strict: smart
18+
name: default
1219
label:
1320
add: ["auto merged"]
1421
- name: Automatically merge release branch changes on CI success and release manager review
@@ -18,9 +25,9 @@ pull_request_rules:
1825
- "label=ready to merge"
1926
- "approved-reviews-by=@release-managers"
2027
actions:
21-
merge:
28+
queue:
2229
method: squash
23-
strict: smart
30+
name: default
2431
label:
2532
add: ["auto merged"]
2633
# This rule exists to handle release branches that are still building using Travis CI instead of
@@ -32,9 +39,9 @@ pull_request_rules:
3239
- "label=ready to merge"
3340
- "approved-reviews-by=@release-managers"
3441
actions:
35-
merge:
42+
queue:
3643
method: squash
37-
strict: smart
44+
name: default
3845
label:
3946
add: ["auto merged"]
4047
- name: Automatically merge PRs from maintainers on CI success and review
@@ -44,9 +51,9 @@ pull_request_rules:
4451
- "label=ready to merge"
4552
- "author=@oss-approvers"
4653
actions:
47-
merge:
54+
queue:
4855
method: squash
49-
strict: smart
56+
name: default
5057
label:
5158
add: ["auto merged"]
5259
- name: Automatically merge autobump PRs on CI success
@@ -56,9 +63,9 @@ pull_request_rules:
5663
- "label~=autobump-*"
5764
- "author:spinnakerbot"
5865
actions:
59-
merge:
66+
queue:
6067
method: squash
61-
strict: smart
68+
name: default
6269
label:
6370
add: ["auto merged"]
6471
- name: Request reviews for autobump PRs on CI failure

0 commit comments

Comments
 (0)