From 9cbcc68829fd5588dc6b840f31de05f463b21ad4 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:32:43 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index cb54acbc59..76c20ec03b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,18 +1,18 @@ queue_rules: - name: default - conditions: + queue_conditions: + - "#approved-reviews-by>1" + - label=automerge + merge_conditions: - base=master + commit_message_template: >- + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash pull_request_rules: - name: automerge to master with label automerge and branch protection passing - conditions: - - "#approved-reviews-by>1" - - label=automerge + conditions: [] actions: queue: - name: default - method: squash - commit_message_template: > - {{ title }} (#{{ number }}) - - {{ body }} \ No newline at end of file