From 70f4f3d5f697a164719c5dd3ad0b41891fe022ab Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 4 May 2021 10:30:32 +0200 Subject: [PATCH] ci: drop quotes for Mergify regex matching The matching with regexes on the `base=` configuration in Mergify does not seem to work as intended. Possibly this is due the addtional quotes around the regex. Fixes: 8d7c66363 (ci: apply standard Mergify rules for release branches too) Signed-off-by: Niels de Vos --- .mergify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 7cb6f1a35..64773a118 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -15,7 +15,7 @@ defaults: pull_request_rules: - name: remove outdated approvals conditions: - - base~='^(devel)|(release-.+)$' + - base~=^(devel)|(release-.+)$ actions: dismiss_reviews: approved: true @@ -32,7 +32,7 @@ pull_request_rules: - name: automatic merge conditions: - label!=DNM - - base~='^(devel)|(release-.+)$' + - base~=^(devel)|(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "status-success=codespell" @@ -58,7 +58,7 @@ pull_request_rules: conditions: - label!=DNM - label=ready-to-merge - - base~='^(devel)|(release-.+)$' + - base~=^(devel)|(release-.+)$ - "#approved-reviews-by>=1" - "status-success=codespell" - "status-success=multi-arch-build"