Skip to content

Commit b4cd635

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent ea559f3 commit b4cd635

File tree

1 file changed

+46
-15
lines changed

1 file changed

+46
-15
lines changed

.mergify.yml

+46-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,42 @@
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
12+
success and 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
22+
and review
23+
queue_conditions:
24+
- base=master
25+
- status-success=build
26+
- "label=ready to merge"
27+
- "author=@oss-approvers"
28+
merge_conditions:
29+
- status-success=build
30+
merge_method: squash
31+
- name: duplicated default from Automatically merge autobump PRs on CI success
32+
queue_conditions:
33+
- base~=^(master|release-)
34+
- status-success=build
35+
- "label~=autobump-*"
36+
- "author:spinnakerbot"
37+
merge_conditions:
438
- status-success=build
39+
merge_method: squash
540

641
pull_request_rules:
742
- name: Automatically merge on CI success and review
@@ -11,21 +46,16 @@ pull_request_rules:
1146
- "label=ready to merge"
1247
- "approved-reviews-by=@oss-approvers"
1348
actions:
14-
queue:
15-
method: squash
16-
name: default
1749
label:
1850
add: ["auto merged"]
19-
- name: Automatically merge release branch changes on CI success and release manager review
51+
- name: Automatically merge release branch changes on CI success and release manager
52+
review
2053
conditions:
2154
- base~=^release-
2255
- status-success=build
2356
- "label=ready to merge"
2457
- "approved-reviews-by=@release-managers"
2558
actions:
26-
queue:
27-
method: squash
28-
name: default
2959
label:
3060
add: ["auto merged"]
3161
- name: Automatically merge PRs from maintainers on CI success and review
@@ -35,9 +65,6 @@ pull_request_rules:
3565
- "label=ready to merge"
3666
- "author=@oss-approvers"
3767
actions:
38-
queue:
39-
method: squash
40-
name: default
4168
label:
4269
add: ["auto merged"]
4370
- name: Automatically merge autobump PRs on CI success
@@ -47,9 +74,6 @@ pull_request_rules:
4774
- "label~=autobump-*"
4875
- "author:spinnakerbot"
4976
actions:
50-
queue:
51-
method: squash
52-
name: default
5377
label:
5478
add: ["auto merged"]
5579
- name: Request reviews for autobump PRs on CI failure
@@ -61,3 +85,10 @@ pull_request_rules:
6185
actions:
6286
request_reviews:
6387
teams: ["oss-approvers"]
88+
- name: Automatically merge PRs from maintainers on CI success and review + Automatically
89+
merge autobump PRs on CI success + Automatically merge on CI success and review
90+
+ Automatically merge release branch changes on CI success and release manager
91+
review
92+
conditions: []
93+
actions:
94+
queue:

0 commit comments

Comments
 (0)