From ccdfcc0bddf8f28638cb21e5fc17537ceeaa3466 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Tue, 12 Jul 2022 15:11:23 -0400 Subject: [PATCH] [ mergify ] require 2 days to pass after last update of PR to merge it Co-authored-by: Mikolaj Konarski --- .github/mergify.yml | 2 ++ CONTRIBUTING.md | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 7f94ccba58e..cc681ab36f6 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -11,6 +11,7 @@ pull_request_rules: conditions: - label=merge me - '#approved-reviews-by>=2' + - updated-at<2 days ago # merge+squash strategy - actions: queue: @@ -23,6 +24,7 @@ pull_request_rules: conditions: - label=squash+merge me - '#approved-reviews-by>=2' + - updated-at<2 days ago queue_rules: - name: default diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 546b36eaa6a..039a6796a9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -183,7 +183,7 @@ We like [this style guide][guide]. [guide]: https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md -GitHub conventions +GitHub Tickets Conventions ------------------- Each major `Cabal`/`cabal-install` release (e.g. 3.4, 3.6, etc.) has a @@ -197,6 +197,20 @@ accepting a fix in that release, i.e. we would very much appreciate someone working on it, but are not committing to actively sourcing someone to work on it. +GitHub Pull Requests Conventions +------------------- + +Every (non-backport) pull request has to go through a review and get 2 approvals. After +this is done, the author of the pull request is expected to add any final touches they +deem important and put the `merge me` label on the pull request. If the author lacks +permissions to apply labels, they are welcome to explicitly signal the merge intent on the discussion thread of the +pull request, at which point others (e.g., reviewers) apply the label. Merge buttons are reserved for exceptional +situations, e.g., CI fixes being iterated on or backports/patches that need to be expedited for a release. + +Currently there is a 2 day buffer for potential extra feedback between the last update of a pull request (e.g. +a commit, a rebase, an addition of the `merge me` label) and the moment the Mergify bot picks up the pull +request for a merge. + Changelog ---------