Skip to content

Commit

Permalink
ci: use regex comparing ~= for release-v* branch checking
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
nixpanic authored and mergify[bot] committed Dec 1, 2023
1 parent c8b542e commit a579533
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit a579533

Please sign in to comment.