diff --git a/.github/mergify.yml b/.github/mergify.yml index dd730b8ca..b95a074a5 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -8,11 +8,29 @@ pull_request_rules: message: Automatically approving lockfile updates merge: method: merge - - name: Merge on approval + + - name: Prepare for merge conditions: - and: - "-draft" - - "#approved-reviews-by>=2" + - "#approved-reviews-by=1" + - "#review-requested=0" + actions: + comment: + message: | + This PR is ready to be merged, and will be in 1 day if nothing happens before. + If you want other people to review your PR, request their reviews. + If you don't want this PR to be merged now, mark it as a Draft. + + - name: Merge on approval + conditions: + - and: + - or: + - "#approved-reviews-by>=2" + - and: + - "#approved-reviews-by=1" + - "updated-at>=1 day ago" + - "-draft" - "#review-requested=0" actions: merge: