Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 21, 2024
1 parent 6d0a6f2 commit 57d68dc
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,19 @@ queue_rules:
- name: default
# Mergify always respects the branch protection settings
# so we can left empty mergify own ones
conditions: []

pull_request_rules:
- name: Automatically merge pull requests
conditions:
queue_conditions:
- label=merge me
- '#approved-reviews-by>=1'
actions:
queue:
method: squash
name: default
# The queue action automatically updates PRs that
# have entered the queue, but in order to do that
# they must have passed CI. Since our CI is a bit
# flaky, PRs can fail to get in, which then means
# they don't get updated, which is extra annoying.
# This just adds the updating as an independent
# step.
merge_conditions: []
merge_method: squash

pull_request_rules:
- name: Automatically update pull requests
conditions:
- label=merge me
actions:
update:
- name: refactored queue action rule
conditions: []
actions:
queue:

0 comments on commit 57d68dc

Please sign in to comment.