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 <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-12-01 10:14:41 +01:00 committed by mergify[bot]
parent c8b542e49a
commit a57953313a

View File

@ -27,7 +27,7 @@ queue_rules:
# Conditions to get out of the queue (= merged) # Conditions to get out of the queue (= merged)
- or: - or:
- and: - and:
- base=release-v* - base~=^(release-.+)$
- "status-success=codespell" - "status-success=codespell"
- "status-success=multi-arch-build" - "status-success=multi-arch-build"
- "status-success=go-test" - "status-success=go-test"
@ -129,7 +129,7 @@ pull_request_rules:
- and: - and:
- author=dependabot[bot] - author=dependabot[bot]
- label!=DNM - label!=DNM
- base=release-v* - base~=^(release-.+)$
- "#approved-reviews-by>=2" - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0" - "#changes-requested-reviews-by=0"
- "approved-reviews-by=@ceph/ceph-csi-contributors" - "approved-reviews-by=@ceph/ceph-csi-contributors"
@ -195,7 +195,7 @@ pull_request_rules:
- or: - or:
- and: - and:
- label!=DNM - label!=DNM
- base=release-v* - base~=^(release-.+)$
- "#approved-reviews-by>=2" - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0" - "#changes-requested-reviews-by=0"
- "approved-reviews-by=@ceph/ceph-csi-contributors" - "approved-reviews-by=@ceph/ceph-csi-contributors"
@ -254,7 +254,7 @@ pull_request_rules:
conditions: conditions:
- or: - or:
- and: - and:
- base=release-v* - base~=^(release-.+)$
- label!=DNM - label!=DNM
- label=ready-to-merge - label=ready-to-merge
- "approved-reviews-by=@ceph/ceph-csi-maintainers" - "approved-reviews-by=@ceph/ceph-csi-maintainers"