Skip to content

Commit 14a34d5

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

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,9 +1,24 @@
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
521

6-
722
pull_request_rules:
823
- name: Auto Squash and Merge
924
conditions:
@@ -12,16 +27,14 @@ pull_request_rules:
1227
- 'label=ready to squash and merge'
1328
actions:
1429
delete_head_branch: {}
15-
queue:
16-
method: squash
17-
name: default
1830
- name: Auto Rebase and Merge
1931
conditions:
2032
- base=master
2133
- status-success=ci
2234
- 'label=ready to rebase and merge'
2335
actions:
2436
delete_head_branch: {}
37+
- name: Auto Rebase and Merge + Auto Squash and Merge
38+
conditions: []
39+
actions:
2540
queue:
26-
method: rebase
27-
name: default

0 commit comments

Comments
 (0)