From 91d31893a8ffed5f6d511deb6151b8d0e0bd6608 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 00:07:08 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 3c438ae1..788e7e70 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 v1.x.x branch conditions: - base=main @@ -29,4 +25,8 @@ pull_request_rules: actions: backport: branches: - - release/v2.x.x \ No newline at end of file + - release/v2.x.x + - name: refactored queue action rule + conditions: [] + actions: + queue: