Skip to content

Commit ab287a2

Browse files
committed
update mergify script
1 parent 33e51aa commit ab287a2

File tree

1 file changed

+7
-38
lines changed

1 file changed

+7
-38
lines changed

.github/mergify.yml

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
pull_request_rules:
32
- name: Ask to resolve conflict
43
conditions:
@@ -45,13 +44,16 @@ pull_request_rules:
4544
review:
4645
type: APPROVE
4746

48-
- name: Add approved dependabot PRs to merge queue + Add to batch merge queue +
49-
Add to merge queue
50-
conditions: []
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
5152
actions:
5253
queue:
54+
5355
queue_rules:
54-
- name: duplicated default from Add to merge queue
56+
- name: Add to merge queue
5557
queue_conditions:
5658
- label=send-it
5759
- base=master
@@ -64,37 +66,4 @@ queue_rules:
6466
6567
Pull-Request: #{{ number }}.
6668
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", "") }}
82-
- name: default
83-
conditions: []
84-
# External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
85-
# using a batch queue allows to circumvent that as mergify creates it from an internal branch.
86-
- name: external_prs
87-
queue_conditions:
88-
- label=send-it-batch
89-
- base=master
90-
merge_conditions: []
91-
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-
10069
{{ body | get_section("## Attributions", "") }}

0 commit comments

Comments
 (0)