Skip to content

Commit 5f4aac6

Browse files
authored
ci(mergify): upgrade configuration to current format
1 parent efbd3b2 commit 5f4aac6

1 file changed

Lines changed: 68 additions & 68 deletions

File tree

.github/mergify.yml

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
pull_request_rules:
2-
- name: auto-merge GitHub Actions dependency bumps
3-
description: >
4-
Automatic merge of GitHub Actions dependency bump PRs with 1 approval
5-
conditions:
6-
- "#approved-reviews-by>=1"
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
15-
- or:
16-
- title~=(?i)bump.*action
17-
- title~=(?i)update.*github.*action
18-
- label=dependencies
19-
- files~=^\.github/workflows/
20-
actions:
21-
merge:
22-
method: squash
23-
commit_message_template: |
24-
{{ title }} (#{{ number }})
2+
- name: auto-merge GitHub Actions dependency bumps
3+
description: >
4+
Automatic merge of GitHub Actions dependency bump PRs with 1 approval
5+
conditions:
6+
- "#approved-reviews-by>=1"
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
15+
- or:
16+
- title~=(?i)bump.*action
17+
- title~=(?i)update.*github.*action
18+
- label=dependencies
19+
- files~=^\.github/workflows/
20+
actions:
21+
merge:
22+
method: squash
23+
commit_message_template: |
24+
{{ title }} (#{{ number }})
2525
26-
{{ body }}
26+
{{ body }}
2727
28-
{% for user in approved_reviews_by %}
29-
Approved-by: {{ user }}
30-
{% endfor %}
31-
delete_head_branch:
28+
{% for user in approved_reviews_by %}
29+
Approved-by: {{ user }}
30+
{% endfor %}
3231
33-
- name: auto-merge
34-
description: >
35-
Automatic merge of PRs to main
36-
conditions:
37-
- "#approved-reviews-by>=2"
38-
- "#changes-requested-reviews-by=0"
39-
- base=main
40-
- label!=do-not-merge
41-
- label!=needs-rebase
42-
- check-success=pre-commit
43-
- check-success=e2e-tests
44-
- check-success=DCO
45-
- check-success=tests
32+
- name: auto-merge
33+
description: >
34+
Automatic merge of PRs to main
35+
conditions:
36+
- "#approved-reviews-by>=2"
37+
- "#changes-requested-reviews-by=0"
38+
- base=main
39+
- label!=do-not-merge
40+
- label!=needs-rebase
41+
- check-success=pre-commit
42+
- check-success=e2e-tests
43+
- check-success=DCO
44+
- check-success=tests
4645
# - check-success=build-latest-image # TODO: uncomment this when the credentials are added to the repo
4746

48-
actions:
49-
merge:
50-
method: squash
51-
commit_message_template: |
52-
{{ title }} (#{{ number }})
47+
actions:
48+
merge:
49+
method: squash
50+
commit_message_template: |
51+
{{ title }} (#{{ number }})
5352
54-
{{ body }}
53+
{{ body }}
5554
56-
{% for user in approved_reviews_by %}
57-
Approved-by: {{ user }}
58-
{% endfor %}
59-
delete_head_branch:
55+
{% for user in approved_reviews_by %}
56+
Approved-by: {{ user }}
57+
{% endfor %}
6058
61-
- name: ping author on conflicts and add 'needs-rebase' label
62-
conditions:
59+
- name: ping author on conflicts and add 'needs-rebase' label
60+
conditions:
6361
- conflict
6462
- -closed
65-
actions:
66-
label:
67-
add:
68-
- needs-rebase
69-
comment:
70-
message: >
71-
This pull request has merge conflicts that must be resolved before it
72-
can be merged. @{{author}} please rebase it.
73-
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
63+
actions:
64+
label:
65+
add:
66+
- needs-rebase
67+
comment:
68+
message: >
69+
This pull request has merge conflicts that must be resolved before it
70+
can be merged. @{{author}} please rebase it.
71+
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
7472
75-
- name: remove 'needs-rebase' label when conflict is resolved
76-
conditions:
73+
- name: remove 'needs-rebase' label when conflict is resolved
74+
conditions:
7775
- -conflict
7876
- -closed
79-
actions:
80-
label:
81-
remove:
82-
- needs-rebase
77+
actions:
78+
label:
79+
remove:
80+
- needs-rebase
81+
merge_protections_settings:
82+
reporting_method: check-runs

0 commit comments

Comments
 (0)