From 95d687d6b617d0b599e8581fd5296036295466de Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:35:17 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 067b234847..e11f74b883 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,20 +1,21 @@ queue_rules: - name: default - conditions: + queue_conditions: + - "#approved-reviews-by>0" + - label=automerge + merge_conditions: - or: - - base=main - - base~=chains/ + - base=main + - base~=chains/ + + commit_message_template: >- + {{ title }} (#{{ number }}) + + {{ body }} + merge_method: squash pull_request_rules: - name: Automerge with label automerge and branch protection passing - conditions: - - "#approved-reviews-by>0" - - label=automerge + conditions: [] actions: queue: - name: default - method: squash - commit_message_template: > - {{ title }} (#{{ number }}) - - {{ body }} \ No newline at end of file