From a6698bf95947c38e144862830cd0d3756a194444 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 01:10:28 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index d3d4330b..73aca86c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,16 +1,14 @@ queue_rules: - name: default + queue_conditions: + - base=master + - label~=merge-queue|dependencies merge_conditions: - check-success=buildbot/nix-build -defaults: - actions: - queue: - allow_merging_configuration_change: true - method: rebase + merge_method: rebase + pull_request_rules: - name: merge using the merge queue - conditions: - - base=master - - label~=merge-queue|dependencies + conditions: [] actions: - queue: {} + queue: