Skip to content

Commit 63ec576

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent b631c8f commit 63ec576

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

.mergify.yml

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +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: rebase
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
5-
19+
merge_method: squash
620

721
pull_request_rules:
822
- name: Auto Squash and Merge
@@ -12,16 +26,14 @@ pull_request_rules:
1226
- 'label=ready to squash and merge'
1327
actions:
1428
delete_head_branch: {}
15-
queue:
16-
method: squash
17-
name: default
1829
- name: Auto Rebase and Merge
1930
conditions:
2031
- base=master
2132
- status-success=ci
2233
- 'label=ready to rebase and merge'
2334
actions:
2435
delete_head_branch: {}
36+
- name: Auto Rebase and Merge + Auto Squash and Merge
37+
conditions: []
38+
actions:
2539
queue:
26-
method: rebase
27-
name: default

0 commit comments

Comments
 (0)