CI: Add Rule to auto merge PR

If the PR is having trivial changes or the reviewer is
confident enough that PR doesn't need a second review,
the reviewer can set `ready-to-merge` label on the PR.
The bot will merge the PR if it's having one approval and the
label `ready-to-merge`

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-05-15 13:55:09 +05:30 committed by Madhu Rajanna
parent 6cea9e2649
commit 78267692fc
2 changed files with 21 additions and 0 deletions

View File

@ -23,6 +23,23 @@ pull_request_rules:
strict: smart strict: smart
dismiss_reviews: {} dismiss_reviews: {}
delete_head_branch: {} delete_head_branch: {}
- name: automatic merge PR having ready-to-merge label
conditions:
- label!=DNM
- label=ready-to-merge
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "status-success=continuous-integration/travis-ci/pr"
- "status-success=DCO"
- "status-success=commitlint"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
- name: backport patches to release v1.2.0 branch - name: backport patches to release v1.2.0 branch
conditions: conditions:
- base=master - base=master

View File

@ -200,6 +200,10 @@ need to be met before it will be merged:
* The 24 working hours counts hours occuring Mon-Fri in the local timezone * The 24 working hours counts hours occuring Mon-Fri in the local timezone
* of the submitter * of the submitter
* Each PR must be fully updated to master and tests must have passed * Each PR must be fully updated to master and tests must have passed
* If the PR is having trivial changes or the reviewer is confident enough that
PR doesn't need a second review, the reviewer can set `ready-to-merge` label
on the PR. The bot will merge the PR if it's having one approval and the
label `ready-to-merge`
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.