Skip to content

Commit 2cec828

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 55d1465 commit 2cec828

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

.mergify.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
queue_rules:
2+
- name: duplicated default from Auto Rebase and Merge
3+
queue_conditions:
4+
- base=master
5+
- status-success=ci
6+
- 'label=ready to squash and merge'
7+
- base=master
8+
- status-success=ci
9+
- 'label=ready to rebase and merge'
10+
merge_conditions: []
11+
merge_method: squash
212
- name: default
3-
conditions:
13+
queue_conditions:
14+
- base=master
15+
- status-success=ci
16+
- 'label=ready to squash and merge'
17+
merge_conditions:
418
- check-success=ci
19+
merge_method: squash
520

621
pull_request_rules:
722
- name: Auto Squash and Merge
@@ -11,16 +26,14 @@ pull_request_rules:
1126
- 'label=ready to squash and merge'
1227
actions:
1328
delete_head_branch: {}
14-
queue:
15-
method: squash
16-
name: default
1729
- name: Auto Rebase and Merge
1830
conditions:
1931
- base=master
2032
- status-success=ci
2133
- 'label=ready to rebase and merge'
2234
actions:
2335
delete_head_branch: {}
36+
- name: Auto Rebase and Merge + Auto Squash and Merge
37+
conditions: []
38+
actions:
2439
queue:
25-
method: squash
26-
name: default

0 commit comments

Comments
 (0)