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 Jan 3, 2025
1 parent 9c14029 commit 2e690e2
Showing 1 changed file with 97 additions and 9 deletions.
106 changes: 97 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,96 @@
# https://blog.mergify.com/strict-mode-deprecation/
queue_rules:
- name: duplicated default from Automatic merge on Azure Pipelines and Reviewable
successes
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
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
- name: duplicated default from Manual merge on Azure Pipelines and Maintainer Override
queue_conditions:
- 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:
- 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
- name: duplicated default from Manual merge on Pipelines and Maintainer Override
from owner PR
queue_conditions:
- 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:
- 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
- name: default
# These define the conditions to get out of the merge queue
conditions:
Expand Down Expand Up @@ -33,9 +124,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 +147,6 @@ pull_request_rules:

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

Expand All @@ -84,8 +169,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:

0 comments on commit 2e690e2

Please sign in to comment.