Skip to content

Commit 3294040

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 0d890fd commit 3294040

File tree

1 file changed

+54
-47
lines changed

1 file changed

+54
-47
lines changed

.github/mergify.yml

Lines changed: 54 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,18 @@
1-
defaults:
2-
actions:
3-
queue:
4-
method: squash
5-
commit_message_template: |
6-
{{ title }}
7-
8-
{{ body | get_section("## Description", "") }}
9-
10-
Pull-Request: #{{ number }}.
11-
12-
{{ body | get_section("## Attributions", "") }}
131

142
pull_request_rules:
153
- name: Ask to resolve conflict
164
conditions:
175
- conflict
186
- -author=dependabot[bot]
197
- or:
20-
- -draft # Don't report conflicts on regular draft.
21-
- and: # Do report conflicts on draft that are scheduled for the next major release.
22-
- draft
23-
- milestone~=v[0-9]\.[0-9]{2}
8+
- -draft # Don't report conflicts on regular draft.
9+
- and: # Do report conflicts on draft that are scheduled for the next major release.
10+
- draft
11+
- milestone~=v[0-9]\.[0-9]{2}
2412
actions:
2513
comment:
26-
message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
27-
28-
- name: Add to merge queue
29-
conditions:
30-
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
31-
- label=send-it
32-
- base=master
33-
actions:
34-
queue:
35-
name: default
36-
37-
# Adds the Pr to the batch queue, so that we can run the interop tests. See the `external_prs` queue for more info.
38-
- name: Add to batch merge queue
39-
conditions:
40-
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
41-
- label=send-it-batch
42-
- base=master
43-
actions:
44-
queue:
45-
name: external_prs
46-
47-
- name: Add approved dependabot PRs to merge queue
48-
conditions:
49-
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
50-
- author=dependabot[bot]
51-
- base=master
52-
actions:
53-
queue:
54-
name: default
14+
message: This pull request has merge conflicts. Could you please resolve them
15+
@{{author}}? 🙏
5516

5617
- name: Remove reviews on updates after PR is queued for merging
5718
conditions:
@@ -61,7 +22,8 @@ pull_request_rules:
6122
- author!=dependabot[bot]
6223
actions:
6324
dismiss_reviews:
64-
message: Approvals have been dismissed because the PR was updated after the `send-it` label was applied.
25+
message: Approvals have been dismissed because the PR was updated after the
26+
`send-it` label was applied.
6527
changes_requested: false
6628

6729
- name: Approve trivial maintainer PRs
@@ -83,11 +45,56 @@ pull_request_rules:
8345
review:
8446
type: APPROVE
8547

48+
- name: Add approved dependabot PRs to merge queue + Add to batch merge queue +
49+
Add to merge queue
50+
conditions: []
51+
actions:
52+
queue:
8653
queue_rules:
54+
- name: duplicated default from Add to merge queue
55+
queue_conditions:
56+
- label=send-it
57+
- base=master
58+
merge_conditions: []
59+
merge_method: squash
60+
commit_message_template: |
61+
{{ title }}
62+
63+
{{ body | get_section("## Description", "") }}
64+
65+
Pull-Request: #{{ number }}.
66+
67+
{{ body | get_section("## Attributions", "") }}
68+
- name: duplicated default from Add approved dependabot PRs to merge queue
69+
queue_conditions:
70+
- author=dependabot[bot]
71+
- base=master
72+
merge_conditions: []
73+
merge_method: squash
74+
commit_message_template: |
75+
{{ title }}
76+
77+
{{ body | get_section("## Description", "") }}
78+
79+
Pull-Request: #{{ number }}.
80+
81+
{{ body | get_section("## Attributions", "") }}
8782
- name: default
8883
conditions: []
8984
# External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
9085
# using a batch queue allows to circumvent that as mergify creates it from an internal branch.
9186
- name: external_prs
92-
conditions: []
87+
queue_conditions:
88+
- label=send-it-batch
89+
- base=master
90+
merge_conditions: []
9391
batch_size: 1
92+
merge_method: squash
93+
commit_message_template: |
94+
{{ title }}
95+
96+
{{ body | get_section("## Description", "") }}
97+
98+
Pull-Request: #{{ number }}.
99+
100+
{{ body | get_section("## Attributions", "") }}

0 commit comments

Comments
 (0)