Skip to content

Commit

Permalink
Mergify: switch from strict mode to a merge queue
Browse files Browse the repository at this point in the history
Previously, we were using Mergify's `smart` mode to serialize the PRs that
Mergify merges. This mode has been deprecated, however, and indeed, there
is a `smart` mode brownout today to force Mergify users to switch over:
https://blog.mergify.com/strict-mode-deprecation/
This PR does just that, based on the migration strategy suggested in that link.
  • Loading branch information
RyanGlScott committed Dec 9, 2021
1 parent 5745d37 commit 0a1169b
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
queue_rules:
- name: default
conditions:
- check-success=mergify

pull_request_rules:
- name: Automatic merge on approval, CI, and ready-to-merge label
conditions:
Expand All @@ -6,9 +11,9 @@ pull_request_rules:
- label=ready-to-merge
actions:
update: {}
merge:
queue:
method: merge
strict: smart+fasttrack
name: default
- name: Delete head branch after merge
conditions:
- merged
Expand Down

0 comments on commit 0a1169b

Please sign in to comment.