Skip to content

Commit d5eaa7c

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 62a3d1c commit d5eaa7c

File tree

1 file changed

+47
-13
lines changed

1 file changed

+47
-13
lines changed

.mergify.yml

+47-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,42 @@
11
queue_rules:
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:
38+
- status-success=build
39+
merge_method: squash
240
- name: default
341
conditions:
442
- status-success=build
@@ -11,21 +49,16 @@ pull_request_rules:
1149
- "label=ready to merge"
1250
- "approved-reviews-by=@oss-approvers"
1351
actions:
14-
queue:
15-
method: squash
16-
name: default
1752
label:
1853
add: ["auto merged"]
19-
- name: Automatically merge release branch changes on CI success and release manager review
54+
- name: Automatically merge release branch changes on CI success and release manager
55+
review
2056
conditions:
2157
- base~=^release-
2258
- status-success=build
2359
- "label=ready to merge"
2460
- "approved-reviews-by=@release-managers"
2561
actions:
26-
queue:
27-
method: squash
28-
name: default
2962
label:
3063
add: ["auto merged"]
3164
- name: Automatically merge PRs from maintainers on CI success and review
@@ -35,9 +68,6 @@ pull_request_rules:
3568
- "label=ready to merge"
3669
- "author=@oss-approvers"
3770
actions:
38-
queue:
39-
method: squash
40-
name: default
4171
label:
4272
add: ["auto merged"]
4373
- name: Automatically merge autobump PRs on CI success
@@ -47,9 +77,6 @@ pull_request_rules:
4777
- "label~=autobump-*"
4878
- "author:spinnakerbot"
4979
actions:
50-
queue:
51-
method: squash
52-
name: default
5380
label:
5481
add: ["auto merged"]
5582
- name: Request reviews for autobump PRs on CI failure
@@ -61,3 +88,10 @@ pull_request_rules:
6188
actions:
6289
request_reviews:
6390
teams: ["oss-approvers"]
91+
- name: Automatically merge PRs from maintainers on CI success and review + Automatically
92+
merge autobump PRs on CI success + Automatically merge on CI success and review
93+
+ Automatically merge release branch changes on CI success and release manager
94+
review
95+
conditions: []
96+
actions:
97+
queue:

0 commit comments

Comments
 (0)