Skip to content

Commit 14775e3

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 09b2769 commit 14775e3

File tree

1 file changed

+42
-14
lines changed

1 file changed

+42
-14
lines changed

.mergify.yml

+42-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,41 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: duplicated default from Automatically merge on CI success and review
3+
queue_conditions:
4+
- base=master
5+
- status-success=build
6+
- "label=ready to merge"
7+
- "approved-reviews-by=@oss-approvers"
8+
merge_conditions:
9+
- status-success=build
10+
merge_method: squash
11+
- name: duplicated default from Automatically merge release branch changes on CI success and
12+
release manager review
13+
queue_conditions:
14+
- base~=^release-
15+
- status-success=build
16+
- "label=ready to merge"
17+
- "approved-reviews-by=@release-managers"
18+
merge_conditions:
19+
- status-success=build
20+
merge_method: squash
21+
- name: duplicated default from Automatically merge PRs from maintainers on CI success and review
22+
queue_conditions:
23+
- base=master
24+
- status-success=build
25+
- "label=ready to merge"
26+
- "author=@oss-approvers"
27+
merge_conditions:
28+
- status-success=build
29+
merge_method: squash
30+
- name: duplicated default from Automatically merge autobump PRs on CI success
31+
queue_conditions:
32+
- base~=^(master|release-)
33+
- status-success=build
34+
- "label~=autobump-*"
35+
- "author:spinnakerbot"
36+
merge_conditions:
437
- status-success=build
38+
merge_method: squash
539

640
pull_request_rules:
741
- name: Automatically merge on CI success and review
@@ -11,9 +45,6 @@ pull_request_rules:
1145
- "label=ready to merge"
1246
- "approved-reviews-by=@oss-approvers"
1347
actions:
14-
queue:
15-
method: squash
16-
name: default
1748
label:
1849
add: ["auto merged"]
1950
- name: Automatically merge release branch changes on CI success and release manager review
@@ -23,9 +54,6 @@ pull_request_rules:
2354
- "label=ready to merge"
2455
- "approved-reviews-by=@release-managers"
2556
actions:
26-
queue:
27-
method: squash
28-
name: default
2957
label:
3058
add: ["auto merged"]
3159
- name: Automatically merge PRs from maintainers on CI success and review
@@ -35,9 +63,6 @@ pull_request_rules:
3563
- "label=ready to merge"
3664
- "author=@oss-approvers"
3765
actions:
38-
queue:
39-
method: squash
40-
name: default
4166
label:
4267
add: ["auto merged"]
4368
- name: Automatically merge autobump PRs on CI success
@@ -47,9 +72,6 @@ pull_request_rules:
4772
- "label~=autobump-*"
4873
- "author:spinnakerbot"
4974
actions:
50-
queue:
51-
method: squash
52-
name: default
5375
label:
5476
add: ["auto merged"]
5577
- name: Request reviews for autobump PRs on CI failure
@@ -61,3 +83,9 @@ pull_request_rules:
6183
actions:
6284
request_reviews:
6385
teams: ["oss-approvers"]
86+
- name: Automatically merge PRs from maintainers on CI success and review + Automatically merge
87+
autobump PRs on CI success + Automatically merge on CI success and review + Automatically
88+
merge release branch changes on CI success and release manager review
89+
conditions: []
90+
actions:
91+
queue:

0 commit comments

Comments
 (0)