Skip to content

Commit a213e27

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 27825f7 commit a213e27

File tree

1 file changed

+34
-9
lines changed

1 file changed

+34
-9
lines changed

.github/mergify.yml

+34-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1-
---
21
defaults:
32
actions:
43
queue:
54
name: default
6-
method: rebase
7-
update_method: rebase
8-
95
queue_rules:
6+
- name: duplicated default from design changes needs approval from at least one
7+
core maintainer
8+
queue_conditions:
9+
- base~=^(main)|(release-.+)$
10+
- label!=design
11+
- "#approved-reviews-by>=1"
12+
- "#changes-requested-reviews-by=0"
13+
- check-success=test-lint
14+
- check-success=test-protoc
15+
- base~=^(main)|(release-.+)$
16+
- label=design
17+
- "#approved-reviews-by>=2"
18+
- "#changes-requested-reviews-by=0"
19+
- "approved-reviews-by=@csi-addons/maintainers"
20+
- check-success=test-lint
21+
- check-success=test-protoc
22+
merge_conditions: []
23+
merge_method: rebase
24+
update_method: rebase
1025
- name: default
11-
conditions:
26+
queue_conditions:
27+
- base~=^(main)|(release-.+)$
28+
- label!=design
29+
- "#approved-reviews-by>=1"
30+
- "#changes-requested-reviews-by=0"
31+
- check-success=test-lint
32+
- check-success=test-protoc
33+
merge_conditions:
1234
- check-success=test-lint
1335
- check-success=test-protoc
36+
merge_method: rebase
37+
update_method: rebase
1438

1539
pull_request_rules:
1640
- name: remove outdated approvals
@@ -30,10 +54,8 @@ pull_request_rules:
3054
- check-success=test-lint
3155
- check-success=test-protoc
3256
actions:
33-
queue: {}
3457
dismiss_reviews: {}
3558
delete_head_branch: {}
36-
3759
- name: design changes needs approval from at least one core maintainer
3860
conditions:
3961
- base~=^(main)|(release-.+)$
@@ -44,10 +66,8 @@ pull_request_rules:
4466
- check-success=test-lint
4567
- check-success=test-protoc
4668
actions:
47-
queue: {}
4869
dismiss_reviews: {}
4970
delete_head_branch: {}
50-
5171
- name: label design changes (update the generated Go files)
5272
conditions:
5373
- files~=^(lib/go/)
@@ -65,3 +85,8 @@ pull_request_rules:
6585
request_reviews:
6686
users_from_teams:
6787
- "@csi-addons/maintainers"
88+
- name: design changes needs approval from at least one core maintainer + merge
89+
after one approval (no design changes)
90+
conditions: []
91+
actions:
92+
queue:

0 commit comments

Comments
 (0)