Skip to content

Commit ae998c9

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 774cdfe commit ae998c9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.mergify.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
queue_rules:
22
- name: default
3-
conditions:
3+
queue_conditions:
44
- base=master
55
- label=S:automerge
6+
merge_conditions:
7+
- base=master
8+
- label=S:automerge
9+
merge_method: squash
610

711
pull_request_rules:
812
- name: automerge to master with label S:automerge and branch protection passing
9-
conditions:
10-
- base=master
11-
- label=S:automerge
13+
conditions: []
1214
actions:
1315
queue:
14-
method: squash
15-
name: default

0 commit comments

Comments
 (0)