Skip to content

Commit aa265f9

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 597600c commit aa265f9

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

.mergify.yml

+19-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
queue_rules:
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:
16+
- check-success=ci
17+
merge_method: rebase
218
- name: default
319
conditions:
420
- check-success=ci
@@ -11,16 +27,14 @@ pull_request_rules:
1127
- 'label=ready to squash and merge'
1228
actions:
1329
delete_head_branch: {}
14-
queue:
15-
method: squash
16-
name: default
1730
- name: Auto Rebase and Merge
1831
conditions:
1932
- base=master
2033
- status-success=ci
2134
- 'label=ready to rebase and merge'
2235
actions:
2336
delete_head_branch: {}
37+
- name: Auto Rebase and Merge + Auto Squash and Merge
38+
conditions: []
39+
actions:
2440
queue:
25-
method: rebase
26-
name: default

0 commit comments

Comments
 (0)