From ab29a7f6d1b0b1cd205205a77b3b791cb1509da4 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:24:10 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index b772e72..40c8ba6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,31 +1,25 @@ queue_rules: - name: default - conditions: - - 'check-success~=Build & Test \(ubuntu-.*\)' - - 'check-success~=Build & Test \(macos-.*\)' - - 'check-success~=Build & Test \(windows-.*\)' - -pull_request_rules: - - name: automatic merge - conditions: + queue_conditions: - 'check-success~=Build & Test \(ubuntu-.*\)' - 'check-success~=Build & Test \(macos-.*\)' - 'check-success~=Build & Test \(windows-.*\)' - "#approved-reviews-by>=1" - "label=merge-queue" - "base=master" - actions: - queue: - name: default - method: merge + merge_conditions: + - 'check-success~=Build & Test \(ubuntu-.*\)' + - 'check-success~=Build & Test \(macos-.*\)' + - 'check-success~=Build & Test \(windows-.*\)' + merge_method: merge +pull_request_rules: - name: delete head branch after merge conditions: - merged - closed actions: delete_head_branch: {} - - name: remove from merge-queue after merge conditions: - merged @@ -33,3 +27,7 @@ pull_request_rules: label: remove: - "merge-queue" + - name: automatic merge + conditions: [] + actions: + queue: