Skip to content

Commit 303e26d

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 12fdf94 commit 303e26d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.mergify.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
- "#approved-reviews-by>1"
5-
6-
pull_request_rules:
7-
- name: automerge to main with label "automerge" and branch protection passing
8-
conditions:
3+
queue_conditions:
94
- "#approved-reviews-by>1"
105
- base=main
116
- label=automerge
12-
actions:
13-
queue:
14-
name: default
15-
method: squash
16-
commit_message_template: |
17-
{{ title }} (#{{ number }})
18-
{{ body }}
7+
merge_conditions:
8+
- "#approved-reviews-by>1"
9+
commit_message_template: |
10+
{{ title }} (#{{ number }})
11+
{{ body }}
12+
merge_method: squash
13+
14+
pull_request_rules:
1915
- name: backport patches to main branch
2016
conditions:
2117
- label=backport/main
@@ -39,3 +35,7 @@ pull_request_rules:
3935
backport:
4036
branches:
4137
- release/v0.19.x
38+
- name: automerge to main with label "automerge" and branch protection passing
39+
conditions: []
40+
actions:
41+
queue:

0 commit comments

Comments
 (0)