From a57953313af9b867264d2165ec9268561f5dcb4c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 1 Dec 2023 10:14:41 +0100 Subject: [PATCH] ci: use regex comparing `~=` for `release-v*` branch checking It seems that `base=release-v*` does not match the `release-v3.10` branch for some reason. Maybe a Mergify update requires stricter checking of strings, and only allows the `~=` operator for regular expressions now? Regular expressions like `base~=^(devel)|(release-.+)$` seem to match for `release-3.10`, so let's use that notation everywhere. Signed-off-by: Niels de Vos --- .mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a698329d804..ac5fb46b4a8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,7 +27,7 @@ queue_rules: # Conditions to get out of the queue (= merged) - or: - and: - - base=release-v* + - base~=^(release-.+)$ - "status-success=codespell" - "status-success=multi-arch-build" - "status-success=go-test" @@ -129,7 +129,7 @@ pull_request_rules: - and: - author=dependabot[bot] - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -195,7 +195,7 @@ pull_request_rules: - or: - and: - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -254,7 +254,7 @@ pull_request_rules: conditions: - or: - and: - - base=release-v* + - base~=^(release-.+)$ - label!=DNM - label=ready-to-merge - "approved-reviews-by=@ceph/ceph-csi-maintainers"