From d991bf3345c5379d16cd6ce3a0ba0e899dd4ef06 Mon Sep 17 00:00:00 2001 From: Mergify <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:21:02 +0000 Subject: [PATCH] ci(mergify): upgrade configuration to current format --- .mergify.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index d859942..87871ee 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,5 +1,8 @@ queue_rules: - name: default + queue_conditions: + - base=main + - label~=merge-queue|dependencies merge_conditions: - check-success=self-test (macos-latest) - check-success=self-test (macos-latest, --no-nom) @@ -7,14 +10,10 @@ queue_rules: - check-success=self-test (ubuntu-latest, --no-nom) - check-success=tests (macos-latest) - check-success=tests (ubuntu-latest) -defaults: - actions: - queue: - merge_method: rebase + merge_method: rebase + pull_request_rules: - name: merge using the merge queue - conditions: - - base=main - - label~=merge-queue|dependencies + conditions: [] actions: - queue: {} + queue: