Skip to content

Commit 12811fe

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

File tree

1 file changed

+31
-10
lines changed

1 file changed

+31
-10
lines changed

.github/mergify.yml

+31-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,36 @@
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 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"
1227
- check-success=test-lint
1328
- 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
1434

1535
pull_request_rules:
1636
- name: remove outdated approvals
@@ -30,10 +50,8 @@ pull_request_rules:
3050
- check-success=test-lint
3151
- check-success=test-protoc
3252
actions:
33-
queue: {}
3453
dismiss_reviews: {}
3554
delete_head_branch: {}
36-
3755
- name: design changes needs approval from at least one core maintainer
3856
conditions:
3957
- base~=^(main)|(release-.+)$
@@ -44,10 +62,8 @@ pull_request_rules:
4462
- check-success=test-lint
4563
- check-success=test-protoc
4664
actions:
47-
queue: {}
4865
dismiss_reviews: {}
4966
delete_head_branch: {}
50-
5167
- name: label design changes (update the generated Go files)
5268
conditions:
5369
- files~=^(lib/go/)
@@ -65,3 +81,8 @@ pull_request_rules:
6581
request_reviews:
6682
users_from_teams:
6783
- "@csi-addons/maintainers"
84+
- name: design changes needs approval from at least one core maintainer + merge
85+
after one approval (no design changes)
86+
conditions: []
87+
actions:
88+
queue:

0 commit comments

Comments
 (0)