mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 14:20:19 +00:00
Add mergify rule to auto merge backported PR
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
3d0cba1931
commit
136d81b736
16
.mergify.yml
16
.mergify.yml
@ -27,3 +27,19 @@ pull_request_rules:
|
|||||||
backport:
|
backport:
|
||||||
branches:
|
branches:
|
||||||
- release-v1.2.0
|
- release-v1.2.0
|
||||||
|
# automerge backports if CI successfully ran
|
||||||
|
- name: automerge backport release-v1.2.0
|
||||||
|
conditions:
|
||||||
|
- author=mergify[bot]
|
||||||
|
- base=release-v1.2.0
|
||||||
|
- label!=DNM
|
||||||
|
- "#changes-requested-reviews-by=0"
|
||||||
|
- "#approved-reviews-by>=1"
|
||||||
|
- "status-success=continuous-integration/travis-ci/pr"
|
||||||
|
actions:
|
||||||
|
merge:
|
||||||
|
method: rebase
|
||||||
|
rebase_fallback: merge
|
||||||
|
strict: smart
|
||||||
|
dismiss_reviews: {}
|
||||||
|
delete_head_branch: {}
|
||||||
|
@ -90,9 +90,14 @@ need to be met before it will be merged:
|
|||||||
When the criteria are met, a project maintainer can merge your changes into
|
When the criteria are met, a project maintainer can merge your changes into
|
||||||
the project's master branch.
|
the project's master branch.
|
||||||
|
|
||||||
### Backporting a PR to release branch
|
### Backport a Fix to a Release Branch
|
||||||
|
|
||||||
If the PR needs to be backported to a release branch, a project maintainer adds
|
The flow for getting a fix into a release branch is:
|
||||||
`backport-to-release-vX.Y.Z` label to the PR. Mergify bot will take care of
|
|
||||||
sending the backport PR to release branch once the PR is merged in the master
|
1. Open a PR to merge the changes to master following the process outlined above.
|
||||||
branch.
|
1. Add the backport label to that PR such as `backport-to-release-vX.Y.Z`
|
||||||
|
1. After your PR is merged to master, the mergify bot will automatically open a
|
||||||
|
PR with your commits backported to the release branch
|
||||||
|
1. If there are any conflicts you will need to resolve them by pulling the
|
||||||
|
branch, resolving the conflicts and force push back the branch
|
||||||
|
1. After the CI is green, the bot will automatically merge the backport PR.
|
||||||
|
Loading…
Reference in New Issue
Block a user