Skip to content

Commit e3fbfee

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

File tree

1 file changed

+33
-8
lines changed

1 file changed

+33
-8
lines changed

.github/mergify.yml

+33-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
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 merge after one approval (no design changes)
7+
queue_conditions:
8+
- base~=^(main)|(release-.+)$
9+
- label!=design
10+
- "#approved-reviews-by>=1"
11+
- "#changes-requested-reviews-by=0"
12+
- check-success=test-lint
13+
- check-success=test-protoc
14+
merge_conditions:
15+
- check-success=test-lint
16+
- check-success=test-protoc
17+
merge_method: rebase
18+
update_method: rebase
19+
- name: duplicated default from design changes needs approval from at least one
20+
core maintainer
21+
queue_conditions:
22+
- base~=^(main)|(release-.+)$
23+
- label=design
24+
- "#approved-reviews-by>=2"
25+
- "#changes-requested-reviews-by=0"
26+
- "approved-reviews-by=@csi-addons/maintainers"
27+
- check-success=test-lint
28+
- check-success=test-protoc
29+
merge_conditions:
30+
- check-success=test-lint
31+
- check-success=test-protoc
32+
merge_method: rebase
33+
update_method: rebase
1034
- name: default
1135
conditions:
1236
- check-success=test-lint
@@ -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)