Skip to content

Commit 5a5a6f8

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 48fbfd0 commit 5a5a6f8

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

.mergify.yml

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: duplicated default from Auto Squash and Merge
3+
queue_conditions:
4+
- base=master
5+
- status-success=ci
6+
- 'label=ready to squash and merge'
7+
merge_conditions:
8+
- check-success=ci
9+
merge_method: squash
10+
- name: duplicated default from Auto Rebase and Merge
11+
queue_conditions:
12+
- base=master
13+
- status-success=ci
14+
- 'label=ready to rebase and merge'
15+
merge_conditions:
416
- check-success=ci
17+
merge_method: squash
518

619
pull_request_rules:
720
- name: Auto Squash and Merge
@@ -11,16 +24,14 @@ pull_request_rules:
1124
- 'label=ready to squash and merge'
1225
actions:
1326
delete_head_branch: {}
14-
queue:
15-
method: squash
16-
name: default
1727
- name: Auto Rebase and Merge
1828
conditions:
1929
- base=master
2030
- status-success=ci
2131
- 'label=ready to rebase and merge'
2232
actions:
2333
delete_head_branch: {}
34+
- name: Auto Rebase and Merge + Auto Squash and Merge
35+
conditions: []
36+
actions:
2437
queue:
25-
method: squash
26-
name: default

0 commit comments

Comments
 (0)