Skip to content

ci(mergify): upgrade configuration to current format #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 43 additions & 35 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,57 @@
# Linear queue for the main branch.
shared:
commit_message_template: &commit-message-template |-
{{ title }} (#{{ number }})
commit_message_template: &commit-message-template |-
{{ title }} (#{{ number }})

{{ body | trim }}
queue_conditions: &queue-conditions
- base=main
- or:
- check-pending=integration-test-result
- check-success=integration-test-result
- label=bypass:integration
merge_conditions: &merge-conditions
- base=main
{{ body | trim }}
queue_conditions: &queue-conditions
- base=main
- or:
- check-pending=integration-test-result
- check-success=integration-test-result
- label=bypass:integration
merge_conditions: &merge-conditions
- base=main
# Rebase PRs with fixup commits are allowed to enter the merge queue but
# should not be allowed to merge if there are leftover fixup commits after rebase
- or:
- label=bypass:linear-history
- check-success=no-fixup-commits
- check-skipped=no-fixup-commits
- or:
- label=bypass:linear-history
- check-success=no-fixup-commits
- check-skipped=no-fixup-commits
# Require integration tests before merging only
- or:
- label=bypass:integration
- check-success=integration-test-result
pr_queue_merge_conditions: &pr-queue-merge-conditions
- base=main
- label=automerge:no-update
- or:
- '#commits-behind=0'
- label=bypass:linear-history
pr_queue_rebase_conditions: &pr-queue-rebase-conditions
- base=main
- label=automerge:rebase
- or:
- '#commits-behind>0'
- linear-history
pr_queue_squash_conditions: &pr-queue-squash-conditions
- base=main
- label=automerge:squash
- or:
- label=bypass:integration
- check-success=integration-test-result
pr_queue_merge_conditions: &pr-queue-merge-conditions
- base=main
- label=automerge:no-update
- or:
- '#commits-behind=0'
- label=bypass:linear-history
pr_queue_rebase_conditions: &pr-queue-rebase-conditions
- base=main
- label=automerge:rebase
- or:
- '#commits-behind>0'
- linear-history
pr_queue_squash_conditions: &pr-queue-squash-conditions
- base=main
- label=automerge:squash

priority_rules:
- name: high_priority
conditions:
- label=priority:high
priority: high

- name: priority for queue `rebase`
conditions:
- queue-name=rebase
priority: 2500
- name: priority for queue `merge`
conditions:
- queue-name=merge
priority: 2250
queue_rules:
- name: rebase
commit_message_template: *commit-message-template
Expand Down Expand Up @@ -86,8 +94,8 @@ pull_request_rules:
- label=automerge:rebase
- '#commits-behind=0'
- or:
- -linear-history
- check-failure=no-fixup-commits
- -linear-history
- check-failure=no-fixup-commits
- -draft
actions:
rebase:
Expand Down