diff --git a/.github/mergify.yml b/.github/mergify.yml index 4a1efe926a8..adafe8c5dea 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -15,6 +15,31 @@ pull_request_rules: - label=merge+no rebase - '#approved-reviews-by>=2' + # label when Mergify is ready but waiting for the above + - actions: + label: + add: + - ready and waiting + name: Waiting out merge delay (used by bot) + conditions: + - base=master + - -draft + - -closed + - or: + - label=merge me + - label=squash+merge me + - label=merge+no rebase + - '#approved-reviews-by>=2' + - '#changes-requested-reviews-by=0' + # oy + - check-success=Formatting / fourmolu + - check-success=Linting / hlint + - check-success=Quick jobs / Meta checks + - check-success=Quick jobs / Doctest Cabal + - check-success=Validate / Validate post job + - check-success=Bootstrap / Bootstrap post job + - 'check-success=docs/readthedocs.org:cabal' + # rebase+merge strategy - actions: queue: