Skip to content

Commit 0653866

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 8251ac4 commit 0653866

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

.github/mergify.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
queue_rules:
2-
- name: default
3-
conditions:
4-
- check-success=Build
5-
6-
pull_request_rules:
7-
- name: automatic merge for master when reviewed and CI passes
8-
conditions:
2+
- name: duplicated default from automatic merge for master when reviewed and CI
3+
passes
4+
queue_conditions:
95
- "#approved-reviews-by>=1"
106
- base=master
117
- label=ready-to-merge
12-
actions:
13-
queue:
14-
name: default
15-
method: squash
16-
- name: automatic merge for updates when CI passes
17-
conditions:
8+
merge_conditions:
9+
- check-success=Build
10+
merge_method: squash
11+
- name: duplicated default from automatic merge for updates when CI passes
12+
queue_conditions:
1813
- "#approved-reviews-by>=1"
1914
- base=master
2015
- label=dependencies
21-
actions:
22-
queue:
23-
name: default
24-
method: squash
16+
merge_conditions:
17+
- check-success=Build
18+
merge_method: squash
19+
20+
pull_request_rules:
2521
- name: delete head branch after merge
2622
conditions:
2723
- merged
@@ -31,5 +27,10 @@ pull_request_rules:
3127
conditions:
3228
- conflict
3329
actions:
34-
comment:
35-
message: This pull request has conflict. Could you fix it @{{author}}?
30+
comment:
31+
message: This pull request has conflict. Could you fix it @{{author}}?
32+
- name: automatic merge for master when reviewed and CI passes + automatic merge
33+
for updates when CI passes
34+
conditions: []
35+
actions:
36+
queue:

0 commit comments

Comments
 (0)