-
Notifications
You must be signed in to change notification settings - Fork 701
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ mergify ] require 2 days to pass after last update of PR to merge it #8285
Conversation
I wonder if this change affects the very PR. Does mergify take its config from master or from current branch? |
@Mikolaj I'd expect from master |
BTW, if this works, let's not forget to add in the next PR an explanation to CONTRIBUTE so that people puzzled by new behaviour have a fighting chance. Also, ask devs there to use the mergify labels instead of big red buttons. |
OK, so we will learn by observing if this PR broke everything. |
Yes, unfortunately, I don't see any other way. |
well making the experiment in a fork before merging upstream 😄 hmm maybe making pr against the branch with the mergify config could work too (but in the fork in any case) |
@jneira: don't kill the suspense ;P But isn't mergify installation somehow org-wide (Haskell org in this case)? Does it really work fine in a fork? I've never tried. |
Right. I can set up Mergify against my fork, I guess. |
Can't self approve... I invited @jneira to help with that: |
@jneira actually, this one: ulysses4ever#3 |
Actually, disregard that, I'll just kill the line about number of approvers in the Margify config. |
Hmm, the experiment failed spectacularly: it merged it right away without waiting ulysses4ever#5 Will have to look into it... |
Okay, I think I got it: I got the inequality in "updated-at>=2 days ago" the other way round (>= means after that moment in time, and we want before). Waiting for the new test PR to be merged in 30 minutes after merge-me label applied ulysses4ever#7 after I will say I'm confident this should work. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we already know this works, could we add the CONTRIBUTING explanations already in this PR? I'd help.
88ff5d0
to
bd387af
Compare
@Mikolaj CHANGELOG updated |
Arghhh, not changelog, but contributing.md |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot. My suggestions. Feel free to ignore/edit.
I forgot to mention the |
ccdfcc0
to
e630f04
Compare
Co-authored-by: Mikolaj Konarski <[email protected]>
e630f04
to
b54e00a
Compare
Added a sentence about |
It doesn't sound as an absolute requirement, so it's fine IMHO. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
many thanks, I did not follow the IRC discussion, could we paste/mention it briefly? i cant think why we want to delay merging even more (they usually takes quite time!)
@jneira some members of the team expressed a concern that PRs sometimes get merged too fast, and the chillout time after review was proposed as a countermeasure. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is pretty fair
2 days have passed. Time to merge? |
Oh wow
https://github.com/haskell/cabal/runs/7448278695?check_suite_focus=true |
Mergify says config-changing PRs have to be merged manually. Merging... |
Per discussion on IRC. Some members of the team expressed a concern that PRs sometimes get merged too fast. A chillout time after review was proposed as a countermeasure. This PR implements 2 day chillout period after last update of any PR against
master
(so, backports are not included in this new policy).Please include the following checklist in your PR:
Please also shortly describe how you tested your change. Bonus points for added tests!