Skip to content

Commit f008c5a

Browse files
chore: update mergify config
1 parent bba69df commit f008c5a

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

.mergify.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1+
queue_rules:
2+
- name: default
3+
merge_method: squash
4+
5+
- name: rebase
6+
merge_method: rebase
7+
18
pull_request_rules:
29
- name: Auto Squash and Merge
310
conditions:
411
- base=master
5-
- status-success=ci
6-
- 'label=ready to squash and merge'
12+
- check-success=ci
13+
- label=ready to squash and merge
714
actions:
8-
delete_head_branch: {}
9-
merge:
10-
method: squash
11-
strict: smart
15+
queue:
16+
name: default
17+
delete_head_branch:
18+
1219
- name: Auto Rebase and Merge
1320
conditions:
1421
- base=master
15-
- status-success=ci
16-
- 'label=ready to rebase and merge'
22+
- check-success=ci
23+
- label=ready to rebase and merge
1724
actions:
18-
delete_head_branch: {}
19-
merge:
20-
method: rebase
21-
strict: smart
25+
queue:
26+
name: rebase
27+
delete_head_branch:

0 commit comments

Comments
 (0)