Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format (#794)
Browse files Browse the repository at this point in the history
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mergify[bot] authored Dec 10, 2024
1 parent e5fdcf1 commit 7685ff3
Showing 1 changed file with 20 additions and 15 deletions.
35 changes: 20 additions & 15 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
queue_rules:
- name: main
allow_inplace_checks: True
allow_checks_interruption: True
speculative_checks: 1
batch_size: 2
# Wait for a few minutes to embark 2 tickets together in a merge train
batch_max_wait_time: "3 minutes"
conditions:
queue_conditions:
- base=main
- -draft
- label!=do-not-merge
merge_conditions:
# Mergify automatically applies status check, approval, and conversation rules,
# which are the same as the GitHub main branch protection rules
# https://docs.mergify.com/conditions/#about-branch-protection
- base=main
allow_inplace_checks: true
batch_size: 2
# Wait for a few minutes to embark 2 tickets together in a merge train
batch_max_wait_time: "3 minutes"
merge_method: squash

pull_request_rules:
- name: main queue triggered when CI passes with 1 review
conditions: []
actions:
queue:

priority_rules:
- name: Priority rule from queue `main`
conditions:
# This queue handles a PR if:
# - it targets main
# - is not in draft
# including automated dependabot PRs.
- base=main
- -draft
- label!=do-not-merge
actions:
queue:
name: main
method: squash
allow_checks_interruption: true

merge_queue:
max_parallel_checks: 1

0 comments on commit 7685ff3

Please sign in to comment.