Skip to content
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

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

Closed
wants to merge 1 commit into from
Closed
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
90 changes: 84 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,91 @@
# https://blog.mergify.com/strict-mode-deprecation/
queue_rules:
- name: duplicated default from Manual merge on Azure Pipelines and Maintainer Override
queue_conditions:
- base=master
- "#approved-reviews-by>=2"
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- status-success=code-review/reviewable
- base=master
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label="Ship It!"
merge_conditions: []
merge_method: merge
- name: duplicated default from Manual merge on Pipelines and Maintainer Override
from owner PR
queue_conditions:
- base=master
- "#approved-reviews-by>=2"
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- status-success=code-review/reviewable
- base=master
- author=puremourning
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- "#changes-requested-reviews-by=0"
- label="Ship It!"
merge_conditions: []
merge_method: merge
- name: duplicated default from Merge auto pr when approved
queue_conditions:
- base=master
- "#approved-reviews-by>=2"
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- status-success=code-review/reviewable
- author=VimspectorUpdateBot
- label=auto
- base=master
- status-success=code-review/reviewable
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
merge_conditions: []
merge_method: merge
- name: default
# These define the conditions to get out of the merge queue
conditions:
queue_conditions:
- base=master
- "#approved-reviews-by>=2"
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
- status-success=code-review/reviewable
merge_conditions:
- status-success=ubuntu-24.04 - Python 3.9 x64
- status-success=macos-14 - Python 3.9 arm64
- 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
merge_method: merge

pull_request_rules:
- name: Automatic merge on Azure Pipelines and Reviewable successes
Expand All @@ -23,9 +100,6 @@ pull_request_rules:
- status-success=Vim tests - old
- status-success=code-review/reviewable
actions: &merge-actions
queue:
method: merge
name: default
comment:
message: Thanks for sending a PR!

Expand All @@ -45,7 +119,6 @@ pull_request_rules:
- label="Ship It!"
actions:
<<: *merge-actions

- name: Manual merge on Pipelines and Maintainer Override from owner PR
conditions:
- base=master
Expand All @@ -61,7 +134,6 @@ pull_request_rules:
- label="Ship It!"
actions:
<<: *merge-actions

- name: Merge auto pr when approved
conditions:
- author=VimspectorUpdateBot
Expand All @@ -73,3 +145,9 @@ pull_request_rules:
- "#changes-requested-reviews-by=0"
actions:
<<: *merge-actions
- name: Automatic merge on Azure Pipelines and Reviewable successes + Manual merge
on Azure Pipelines and Maintainer Override + Manual merge on Pipelines and Maintainer
Override from owner PR + Merge auto pr when approved
conditions: []
actions:
queue: