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.

Sign up for GitHub

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 #1768

Closed
wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 90 additions & 10 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,77 @@
# 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=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
- status-success=ubuntu-24.04 - without libclang completer - test run
- status-success=ubuntu-24.04 - with Clang compiler - test run
- status-success=ubuntu-24.04 - test run
- status-success=C++ Lint
- status-success=Windows MSVC 16 x64 - test run
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- status-success=code-review/reviewable
- base=master
- status-success=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
- status-success=ubuntu-24.04 - without libclang completer - test run
- status-success=ubuntu-24.04 - with Clang compiler - test run
- status-success=ubuntu-24.04 - test run
- status-success=C++ Lint
- status-success=Windows MSVC 16 x64 - test run
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- "#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=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
- status-success=ubuntu-24.04 - without libclang completer - test run
- status-success=ubuntu-24.04 - with Clang compiler - test run
- status-success=ubuntu-24.04 - test run
- status-success=C++ Lint
- status-success=Windows MSVC 16 x64 - test run
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- status-success=code-review/reviewable
- base=master
- author=puremourning
- status-success=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
- status-success=ubuntu-24.04 - without libclang completer - test run
- status-success=ubuntu-24.04 - with Clang compiler - test run
- status-success=ubuntu-24.04 - test run
- status-success=C++ Lint
- status-success=Windows MSVC 16 x64 - test run
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- "#changes-requested-reviews-by=0"
- label="Ship It!"
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=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
Expand All @@ -14,6 +83,20 @@ queue_rules:
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- status-success=code-review/reviewable
merge_conditions:
- status-success=macos-14 - C++ Benchmark
- status-success=macos-14 - test run
- status-success=ubuntu-24.04 - C++ Benchmark
- status-success=ubuntu-24.04 - without libclang completer - test run
- status-success=ubuntu-24.04 - with Clang compiler - test run
- status-success=ubuntu-24.04 - test run
- status-success=C++ Lint
- status-success=Windows MSVC 16 x64 - test run
- status-success=Windows MSVC 17 x64 - test run
- status-success=Windows MSVC 17 x86 - test run
- status-success=Windows MSVC 17 x64 - C++ Benchmark
merge_method: merge

pull_request_rules:
- name: Automatic merge on Azure Pipelines and Reviewable successes
Expand All @@ -33,9 +116,6 @@ pull_request_rules:
- status-success=Windows MSVC 17 x64 - C++ Benchmark
- status-success=code-review/reviewable
actions:
queue:
method: merge
name: default
comment:
message: Thanks for sending a PR!

Expand All @@ -59,9 +139,6 @@ pull_request_rules:

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

Expand All @@ -84,8 +161,11 @@ pull_request_rules:
- "#changes-requested-reviews-by=0"
- label="Ship It!"
actions:
queue:
method: merge
name: default
comment:
message: Thanks for sending a PR!
- 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
conditions: []
actions:
queue:
Loading