From b75b8fd95e47e48347f9704439a5f860a6f4b5cb Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:31:00 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a544927762..e216fd2433 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=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 main branch conditions: - label=backport/main @@ -39,3 +35,7 @@ pull_request_rules: backport: branches: - release/v0.19.x + - name: refactored queue action rule + conditions: [] + actions: + queue: