Skip to content

Commit

Permalink
Merge pull request #4002 from puremourning/mergify-queue
Browse files Browse the repository at this point in the history
Switch to mergify queues (YCM)
  • Loading branch information
puremourning authored Jan 11, 2022
2 parents 401218a + 92af6ce commit 7684b6c
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# https://blog.mergify.com/strict-mode-deprecation/
queue_rules:
- name: default
# These define the conditions to get out of the merge queue
conditions:
- status-success=ubuntu-20.04 - Python 3.6 x64
- status-success=macos-10.15 - Python 3.6 x64
- status-success=windows-2019 - Python 3.9 x64
- status-success=windows-2019 - Python 3.9 x86
- status-success=Vim tests - new
- status-success=Vim tests - old

pull_request_rules:
- name: Automatic merge on Azure Pipelines and Reviewable successes
conditions:
Expand All @@ -11,9 +23,9 @@ pull_request_rules:
- status-success=Vim tests - old
- status-success=code-review/reviewable
actions:
merge:
queue:
method: merge
strict: true
name: default
comment:
message: Thanks for sending a PR!
- name: Manual merge on Azure Pipelines and Maintainer Override
Expand All @@ -31,8 +43,8 @@ pull_request_rules:

- label="Ship It!"
actions:
merge:
queue:
method: merge
strict: true
name: default
comment:
message: Thanks for sending a PR!

0 comments on commit 7684b6c

Please sign in to comment.