Auto-merge the backport PR with one core dev approval and all passing CI
Hi,
I will have some time in the next couple weeks to work on miss-islington. I'm thinking to work on this issue: https://github.com/python/miss-islington/issues/44
The idea is to have miss-islington automatically merge the backport PR, after all CI passed and after a core dev approved the PR. I think this will save us a lot of button clicks and time.
Just wanted to check if everyone is pretty much +1 on this, before I start writing the code.
Some notes and implicationss:
- The expectation is that the commit message has already been cleaned up on the master branch
- It already knows how to replace the # to GH- in the commit message
- miss-islington will need write access to CPython
- git log it will show miss-islington (bot) as the committer
- If you still want to do the merge yourself, then just don't approve miss-islington's PR.
What does everyone here think about all that?
Thanks.
Mariatta Wijaya
I like to seek one clarification.
I know git has author as well as committer. I am assuming that even if miss-islington backports the PR, the author'ship of the patch is still preserved.
Is that correct?
Thank you, Senthil
On Mon, Feb 5, 2018 at 6:18 AM, Senthil Kumaran <senthil@uthcode.com> wrote:
On Mon, Feb 5, 2018 at 9:28 AM, Senthil Kumaran <senthil@uthcode.com> wrote:
Thanks, Senthil. Currently, the original PR author on master will be credited as a co-author on backport PRs. See this example [1] where it says "2 people authored (miss-islington and csabella) and ncoghlan committed" If this idea got implemented, I believe it will say "2 people authored (miss-islington and csabella) and miss-islington committed"
[1] https://github.com/python/cpython/commit/fea0a12f6bee4a36b2c9533003e33a12c58...
On 6 February 2018 at 00:07, Mariatta Wijaya <mariatta.wijaya@gmail.com> wrote:
+1 from me, as being able to do the backport PR reviews as soon as Miss Islington creates them means I'll still have the original review fresh in my mind. (I know I can theoretically do that now, but I currently tend not to look at the details of the backport PRs until the CI run is finished)
Cheers, Nick.
-- Nick Coghlan | ncoghlan@gmail.com | Brisbane, Australia
On 2/5/2018 9:34 AM, Nick Coghlan wrote:
and that Miss Islington has correctly copied the title and commit message.
I believe that this is already true unless there was a merge conflict.
If I have to use cherry-picker because there is a merge conflict and I use cherry-picker --continue after resolving, then I am the author and I cannot approve my own PR. The auto generated title has no relation to the title of the original merge, and the commit message is replaced by the reminder. Finding the original commit message to paste in is not easy.
What does everyone here think about all that?
+1
I have just started doing this, and approving when I am allowed. I like it better than waiting, (or not reviewing).
Terry
This is now done!
miss-islington has been promoted as committer ;)
If you approve the PR and all CI passed, miss-islington will merge it. Example: https://github.com/python/cpython/pull/5547#event-1468940344
Enjoy!
Mariatta Wijaya
ᐧ
+1 Miss Islington does a lot of great work maintaining all the released versions while we get to focus on the latest and greatest. Deserves commit rights :o)
Top-posted from my Windows phone
From: Mariatta Wijaya Sent: Monday, February 12, 2018 0:19 To: Terry Reedy Cc: python-committers Subject: Re: [python-committers] Auto-merge the backport PR with one coredev approval and all passing CI
This is now done!
miss-islington has been promoted as committer ;)
If you approve the PR and all CI passed, miss-islington will merge it. Example: https://github.com/python/cpython/pull/5547#event-1468940344
Enjoy!
Mariatta Wijaya
ᐧ
participants (5)
-
Mariatta Wijaya
-
Nick Coghlan
-
Senthil Kumaran
-
Steve Dower
-
Terry Reedy