From 1a48c7cba6e67d8f39f5c11b1eaef9e5ee4e4440 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:33:01 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .github/mergify.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index ed282eb0..23b9f949 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,13 +1,6 @@ queue_rules: - name: default - conditions: - # Conditions to get out of the queue (= merged) - - check-success=lint - - check-success=test - -pull_request_rules: - - name: Automatic merge on approval - conditions: + queue_conditions: - base=main - "#approved-reviews-by>=1" - "#changes-requested-reviews-by=0" @@ -15,9 +8,16 @@ pull_request_rules: - check-success='test' - label!=do-not-merge - label=ready-to-merge + merge_conditions: + # Conditions to get out of the queue (= merged) + - check-success=lint + - check-success=test + merge_method: merge + commit_message_template: | + {{ title }} (#{{ number }}) + +pull_request_rules: + - name: refactored queue action rule + conditions: [] actions: queue: - method: merge - name: default - commit_message_template: | - {{ title }} (#{{ number }})