From 0c109c5dec8aceeff4eb8e13c2059e168a1ec85a Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 11 Jan 2022 09:17:46 +0100 Subject: [PATCH] ci: remove queue actions from non-merge rules in Mergify config By the addition of the queue rules in the Mrgify configuration, all PRs that require changes, or have been updated and review should be dropped, are now added to the queue for merging. This is obviously not what we want. Fixes: 43fc945 ("ci: move from merge action to queue action") Signed-off-by: Niels de Vos --- .mergify.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 089cebdf8..5c1fef404 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -67,8 +67,6 @@ pull_request_rules: conditions: - base~=^(devel)|(release-.+)$ actions: - queue: - name: default dismiss_reviews: approved: true changes_requested: false @@ -77,8 +75,6 @@ pull_request_rules: - conflict - author!=dependabot[bot] actions: - queue: - name: default comment: # yamllint disable-line rule:truthy message: "This pull request now has conflicts with the target branch.