Skip to content

Commit 65b1aa7

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent b0cc7d7 commit 65b1aa7

File tree

1 file changed

+54
-14
lines changed

1 file changed

+54
-14
lines changed

.mergify.yml

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

650
pull_request_rules:
751
- name: Automatically merge on CI success and review
@@ -11,21 +55,16 @@ pull_request_rules:
1155
- "label=ready to merge"
1256
- "approved-reviews-by=@oss-approvers"
1357
actions:
14-
queue:
15-
method: squash
16-
name: default
1758
label:
1859
add: ["auto merged"]
19-
- name: Automatically merge release branch changes on CI success and release manager review
60+
- name: Automatically merge release branch changes on CI success and release manager
61+
review
2062
conditions:
2163
- base~=^release-
2264
- status-success=build
2365
- "label=ready to merge"
2466
- "approved-reviews-by=@release-managers"
2567
actions:
26-
queue:
27-
method: squash
28-
name: default
2968
label:
3069
add: ["auto merged"]
3170
- name: Automatically merge PRs from maintainers on CI success and review
@@ -35,9 +74,6 @@ pull_request_rules:
3574
- "label=ready to merge"
3675
- "author=@oss-approvers"
3776
actions:
38-
queue:
39-
method: squash
40-
name: default
4177
label:
4278
add: ["auto merged"]
4379
- name: Automatically merge autobump PRs on CI success
@@ -47,9 +83,6 @@ pull_request_rules:
4783
- "label~=autobump-*"
4884
- "author:spinnakerbot"
4985
actions:
50-
queue:
51-
method: squash
52-
name: default
5386
label:
5487
add: ["auto merged"]
5588
- name: Request reviews for autobump PRs on CI failure
@@ -61,3 +94,10 @@ pull_request_rules:
6194
actions:
6295
request_reviews:
6396
teams: ["oss-approvers"]
97+
- name: Automatically merge PRs from maintainers on CI success and review + Automatically
98+
merge autobump PRs on CI success + Automatically merge on CI success and review
99+
+ Automatically merge release branch changes on CI success and release manager
100+
review
101+
conditions: []
102+
actions:
103+
queue:

0 commit comments

Comments
 (0)