ci: apply standard Mergify rules for release branches too

It is not always possible to automatically backport PRs to release
branches. That also means that these backport PRs are not created by the
mergify[bot] account. Because of this, it is needed to manually merge
PRs, as Mergify refuses to do it.

By changing the `base=` option to match a regular expression that
includes both `devel` and `release-*` branches, Mergify should assist
with merging PRs to release branches too.

Note that the `ci/centos` branch is different, as runs other tests than
the normal branches.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-05-03 15:14:55 +02:00 committed by Madhu Rajanna
parent d59903efe1
commit 8d7c66363d

View File

@ -15,7 +15,7 @@ defaults:
pull_request_rules: pull_request_rules:
- name: remove outdated approvals - name: remove outdated approvals
conditions: conditions:
- base=devel - base~='^(devel)|(release-.+)$'
actions: actions:
dismiss_reviews: dismiss_reviews:
approved: true approved: true
@ -32,7 +32,7 @@ pull_request_rules:
- name: automatic merge - name: automatic merge
conditions: conditions:
- label!=DNM - label!=DNM
- base=devel - base~='^(devel)|(release-.+)$'
- "#approved-reviews-by>=2" - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0" - "#changes-requested-reviews-by=0"
- "status-success=codespell" - "status-success=codespell"
@ -58,7 +58,7 @@ pull_request_rules:
conditions: conditions:
- label!=DNM - label!=DNM
- label=ready-to-merge - label=ready-to-merge
- base=devel - base~='^(devel)|(release-.+)$'
- "#approved-reviews-by>=1" - "#approved-reviews-by>=1"
- "status-success=codespell" - "status-success=codespell"
- "status-success=multi-arch-build" - "status-success=multi-arch-build"