Skip to content

Commit ff97fcf

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

File tree

1 file changed

+51
-8
lines changed

1 file changed

+51
-8
lines changed

.github/mergify.yml

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,61 @@
1-
---
21
defaults:
32
actions:
43
queue:
54
name: default
6-
method: rebase
7-
update_method: rebase
8-
95
queue_rules:
10-
- name: default
11-
conditions:
6+
- name: duplicated default from merge after two approvals (no API changes)
7+
queue_conditions:
8+
- base~=^(main)|(release-.+)$
9+
- label!=DNM
10+
- label!=api
11+
- "#approved-reviews-by>=2"
12+
- "#changes-requested-reviews-by=0"
13+
- "status-success=codespell"
14+
- "status-success=build_bundle"
15+
- "status-success=build_controller"
16+
- "status-success=build_sidecar"
17+
- "status-success=go_mod_verify"
18+
- "status-success=go_mod_vendor"
19+
- "status-success=kind_deploy"
20+
- "status-success=make_test"
21+
merge_conditions:
22+
- "status-success=codespell"
23+
- "status-success=build_bundle"
24+
- "status-success=build_controller"
25+
- "status-success=build_sidecar"
26+
- "status-success=go_mod_verify"
27+
- "status-success=go_mod_vendor"
28+
- "status-success=kind_deploy"
29+
merge_method: rebase
30+
update_method: rebase
31+
- name: duplicated default from API changes needs approval from a contributor and
32+
a reviewer
33+
queue_conditions:
34+
- base~=^(main)|(release-.+)$
35+
- label!=DNM
36+
- label=api
37+
- "#approved-reviews-by>=2"
38+
- "#changes-requested-reviews-by=0"
39+
- "approved-reviews-by=@csi-addons/kubernetes-csi-addons-contributors"
40+
- "approved-reviews-by=@csi-addons/kubernetes-csi-addons-reviewers"
1241
- "status-success=codespell"
1342
- "status-success=build_bundle"
1443
- "status-success=build_controller"
1544
- "status-success=build_sidecar"
1645
- "status-success=go_mod_verify"
1746
- "status-success=go_mod_vendor"
1847
- "status-success=kind_deploy"
48+
- "status-success=make_test"
49+
merge_conditions:
50+
- "status-success=codespell"
51+
- "status-success=build_bundle"
52+
- "status-success=build_controller"
53+
- "status-success=build_sidecar"
54+
- "status-success=go_mod_verify"
55+
- "status-success=go_mod_vendor"
56+
- "status-success=kind_deploy"
57+
merge_method: rebase
58+
update_method: rebase
1959

2060
pull_request_rules:
2161
- name: remove outdated approvals
@@ -41,7 +81,6 @@ pull_request_rules:
4181
- "status-success=kind_deploy"
4282
- "status-success=make_test"
4383
actions:
44-
queue: {}
4584
dismiss_reviews: {}
4685
delete_head_branch: {}
4786
- name: API changes needs approval from a contributor and a reviewer
@@ -62,7 +101,6 @@ pull_request_rules:
62101
- "status-success=kind_deploy"
63102
- "status-success=make_test"
64103
actions:
65-
queue: {}
66104
dismiss_reviews: {}
67105
delete_head_branch: {}
68106
- name: pr title contains DNM
@@ -103,3 +141,8 @@ pull_request_rules:
103141
request_reviews:
104142
users_from_teams:
105143
- "@csi-addons/kubernetes-csi-addons-contributors"
144+
- name: API changes needs approval from a contributor and a reviewer + merge after
145+
two approvals (no API changes)
146+
conditions: []
147+
actions:
148+
queue:

0 commit comments

Comments
 (0)