Skip to content

Commit 0a5a284

Browse files
authored
ci(mergify): upgrade configuration to current format
1 parent 2d2ca4e commit 0a5a284

1 file changed

Lines changed: 41 additions & 40 deletions

File tree

.github/mergify.yml

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,52 @@
11
pull_request_rules:
2-
- name: auto-merge
3-
description: >
4-
Automatic merge of PRs to main
5-
conditions:
6-
- "#approved-reviews-by>=2"
7-
- "#changes-requested-reviews-by=0"
8-
- base=main
9-
- label!=do-not-merge
10-
- label!=needs-rebase
11-
- check-success=pre-commit
12-
- check-success=e2e-tests
13-
- check-success=DCO
14-
- check-success=tests
2+
- name: auto-merge
3+
description: >
4+
Automatic merge of PRs to main
5+
conditions:
6+
- "#approved-reviews-by>=2"
7+
- "#changes-requested-reviews-by=0"
8+
- base=main
9+
- label!=do-not-merge
10+
- label!=needs-rebase
11+
- check-success=pre-commit
12+
- check-success=e2e-tests
13+
- check-success=DCO
14+
- check-success=tests
1515
# - check-success=build-latest-image # TODO: uncomment this when the credentials are added to the repo
1616

17-
actions:
18-
merge:
19-
method: squash
20-
commit_message_template: |
21-
{{ title }} (#{{ number }})
17+
actions:
18+
merge:
19+
method: squash
20+
commit_message_template: |
21+
{{ title }} (#{{ number }})
2222
23-
{{ body }}
23+
{{ body }}
2424
25-
{% for user in approved_reviews_by %}
26-
Approved-by: {{ user }}
27-
{% endfor %}
28-
delete_head_branch:
25+
{% for user in approved_reviews_by %}
26+
Approved-by: {{ user }}
27+
{% endfor %}
2928
30-
- name: ping author on conflicts and add 'needs-rebase' label
31-
conditions:
29+
- name: ping author on conflicts and add 'needs-rebase' label
30+
conditions:
3231
- conflict
3332
- -closed
34-
actions:
35-
label:
36-
add:
37-
- needs-rebase
38-
comment:
39-
message: >
40-
This pull request has merge conflicts that must be resolved before it
41-
can be merged. @{{author}} please rebase it.
42-
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
33+
actions:
34+
label:
35+
add:
36+
- needs-rebase
37+
comment:
38+
message: >
39+
This pull request has merge conflicts that must be resolved before it
40+
can be merged. @{{author}} please rebase it.
41+
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
4342
44-
- name: remove 'needs-rebase' label when conflict is resolved
45-
conditions:
43+
- name: remove 'needs-rebase' label when conflict is resolved
44+
conditions:
4645
- -conflict
4746
- -closed
48-
actions:
49-
label:
50-
remove:
51-
- needs-rebase
47+
actions:
48+
label:
49+
remove:
50+
- needs-rebase
51+
merge_protections_settings:
52+
reporting_method: check-runs

0 commit comments

Comments
 (0)