Skip to content

Commit ddc0efe

Browse files
Merge pull request #148 from tinkerbell/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents c50090b + 64308da commit ddc0efe

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

.github/mergify.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,20 @@ shared:
1818

1919
queue_rules:
2020
- name: default
21-
conditions:
21+
queue_conditions:
2222
- and: *compulsory
23-
24-
pull_request_rules:
25-
- name: Automatic merge on approval
26-
conditions:
23+
- label=ready-to-merge
24+
merge_conditions:
2725
- and: *compulsory
2826

29-
# Ensure the review is opted in using labels.
30-
- label=ready-to-merge
27+
commit_message_template: |
28+
{{ title }} (#{{ number }})
3129
30+
{{ body }}
31+
merge_method: merge
32+
33+
pull_request_rules:
34+
- name: Automatic merge on approval
35+
conditions: []
3236
actions:
3337
queue:
34-
method: merge
35-
name: default
36-
commit_message_template: |
37-
{{ title }} (#{{ number }})
38-
39-
{{ body }}

0 commit comments

Comments
 (0)