diff --git a/.mergify.yml b/.mergify.yml index 23eb45476a4b..17ce5a165caf 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,21 +1,17 @@ queue_rules: - name: default - conditions: - - "#approved-reviews-by>1" - -pull_request_rules: - - name: automerge to main with label automerge and branch protection passing - conditions: + queue_conditions: - "#approved-reviews-by>1" - base=main - label=A:automerge - actions: - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - {{ body }} + merge_conditions: + - "#approved-reviews-by>1" + merge_method: squash + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body }} + +pull_request_rules: - name: backport patches to v0.50.x branch conditions: - base=main @@ -48,3 +44,7 @@ pull_request_rules: backport: branches: - release/v0.45.x + - name: refactored queue action rule + conditions: [] + actions: + queue: