Skip to content

Commit

Permalink
update mergify script
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs committed Jan 10, 2025
1 parent 33e51aa commit 5614bbb
Showing 1 changed file with 8 additions and 38 deletions.
46 changes: 8 additions & 38 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

pull_request_rules:
- name: Ask to resolve conflict
conditions:
Expand Down Expand Up @@ -45,13 +44,17 @@ pull_request_rules:
review:
type: APPROVE

- name: Add approved dependabot PRs to merge queue + Add to batch merge queue +
Add to merge queue
conditions: []
- name: Add approved dependabot PRs to merge queue
conditions:
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
- author=dependabot[bot]
- base=master
actions:
queue:
name: default

queue_rules:
- name: duplicated default from Add to merge queue
- name: Add to merge queue
queue_conditions:
- label=send-it
- base=master
Expand All @@ -64,37 +67,4 @@ queue_rules:
Pull-Request: #{{ number }}.
{{ body | get_section("## Attributions", "") }}
- name: duplicated default from Add approved dependabot PRs to merge queue
queue_conditions:
- author=dependabot[bot]
- base=master
merge_conditions: []
merge_method: squash
commit_message_template: |
{{ title }}
{{ body | get_section("## Description", "") }}
Pull-Request: #{{ number }}.
{{ body | get_section("## Attributions", "") }}
- name: default
conditions: []
# External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
# using a batch queue allows to circumvent that as mergify creates it from an internal branch.
- name: external_prs
queue_conditions:
- label=send-it-batch
- base=master
merge_conditions: []
batch_size: 1
merge_method: squash
commit_message_template: |
{{ title }}
{{ body | get_section("## Description", "") }}
Pull-Request: #{{ number }}.
{{ body | get_section("## Attributions", "") }}

0 comments on commit 5614bbb

Please sign in to comment.