From 92d00c8f316d50c8e57a0cfe0517311396a6be3f Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:29:10 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .github/mergify.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 051cf45..f987f95 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,27 +1,21 @@ queue_rules: - name: default - conditions: - - 'status-success~=Build & Test - Nixpkgs.*' - -pull_request_rules: - - name: automatic merge - conditions: + queue_conditions: - 'status-success~=Build & Test - Nixpkgs.*' - "#approved-reviews-by>=1" - "label=merge-queue" - "base=main" - actions: - queue: - name: default - method: merge + merge_conditions: + - 'status-success~=Build & Test - Nixpkgs.*' + 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 @@ -29,3 +23,7 @@ pull_request_rules: label: remove: - "merge-queue" + - name: refactored queue action rule + conditions: [] + actions: + queue: