From 2d6ec2575c25bc3d1504d2038fe351ca72bfa70c Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:43:40 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 17740d63..3e881edb 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,16 +1,14 @@ queue_rules: - name: default - merge_conditions: - - check-success=buildbot/nix-build -defaults: - actions: - queue: - allow_merging_configuration_change: true - method: rebase -pull_request_rules: - - name: merge using the merge queue - conditions: + queue_conditions: - base=main - label~=merge-queue|auto-merge|dependencies + merge_conditions: + - check-success=buildbot/nix-build + merge_method: rebase + +pull_request_rules: + - name: merge using the merge queue + conditions: [] actions: queue: