Skip to content
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

Prepare the 1.3.0.dev6 release. #4169

Merged
merged 4 commits into from Jan 6, 2017

Conversation

@mateor
Copy link
Member

commented Jan 6, 2017

No description provided.

@mateor mateor requested review from baroquebobcat, stuhood and kwlzn Jan 6, 2017

@stuhood
Copy link
Member

left a comment

It looks like build-support/bin/contributors.sh might not have been run here... at least one of these commits was from a new contributor.

`PR #4157 <https://github.com/pantsbuild/pants/pull/4157>`_

* Fix release script owners check.
`Commit <https://github.com/pantsbuild/pants/commit/a40234429cc05f6483f91b08f10037429710b5b4>`

This comment has been minimized.

Copy link
@stuhood

stuhood Jan 6, 2017

Member

Looks like this might need a trailing _ to render correctly...?

@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

oh - yep you are right. Will update.

Also - I meant to comment to this affect, but I didn't find a pull request for john's commit. I just linked to the commit itself. Maybe I missed it somewhere...

@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

Hmmm...that release-script gave me unexpected output:

-+ Fiona Condone
++ Fiona
 + Florian Leibert
 + Gabriel Gonzalez
 + Garrett Malmquist
@@ -55,6 +55,7 @@ Created by running `build-support/bin/contributors.sh`.
 + Jason Jackson
 + Jeff Jenkins
 + Jessica Rosenfield
++ JieGhost
 + Jin Feng
 + Joe Crobak
 + Joe Ennever
@@ -135,3 +136,4 @@ Created by running `build-support/bin/contributors.sh`.
 + Wolfram Arnold
 + Yi Cheng
 + Yujie Chen
++ nsaechao
(END)

Will need to dig a bit here...

@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

I am pressed for time, so I am going to take the easy way out and add the affected names to the mailmap. Will open an issue for future triage.

Add 1.3.0dev6 contributors
Add some recent emails to the mailmap.
There is no easily discoverable author for one
contributor so leaving the contribution credit
in the state it was submitted.
@jsirois

This comment has been minimized.

Copy link
Member

commented Jan 6, 2017

@mateor - that's the correct response, no need to undo.

History indicates the original add may have been manual or at least manually edited to add the last name:

$ git log | grep -i fiona
Author: Fiona <fiona@giphy.com>
$ git grep -i fiona
CONTRIBUTORS.md:+ Fiona Condone
$ git blame CONTRIBUTORS.md | grep -i fiona
f0daa0b54d (Yi Cheng          2016-12-09 00:38:17 -0800  42) + Fiona Condone

Also, the commit of mine with no PR had no PR - I directly submitted w/o review to get release out.

@wisechengyi

This comment has been minimized.

Copy link
Contributor

commented Jan 6, 2017

ha right. I had to look up slack to know her last name

@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

Ah, okay - thanks. Should be all set for the next releaser - I mapped the ones that were previously done manually.

@jsirois

This comment has been minimized.

Copy link
Member

commented Jan 6, 2017

Also:

$ git log | grep Yujie | grep Author | sort | uniq -c
     27 Author: Yujie Chen <yujieproject@gmail.com>
$ git log | grep JieGhost | grep Author | sort | uniq -c
      1 Author: JieGhost <yujieproject@gmail.com>

So Yujie either changed machines or changed his gitconfig for this latest commit.

And

$ git log | grep nsaechao
Author: nsaechao <nysaechao@outlook.com>

So that's just the way it is unless you have mailing list or slack info to indicate a real name.

@wisechengyi

This comment has been minimized.

Copy link
Contributor

commented Jan 6, 2017

nsaechao is Ny Saechao

@jsirois
jsirois approved these changes Jan 6, 2017
Add name of contributor
someone had intel...
@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

Thanks @wisechengyi - updated!

@mateor

This comment has been minimized.

Copy link
Member Author

commented Jan 6, 2017

screen shot 2017-01-06 at 6 15 19 pm

The free Commit link looks a bit funny in the diff - but the render appears okay

@stuhood
stuhood approved these changes Jan 6, 2017
Copy link
Member

left a comment

Thanks Mateo.

@mateor mateor merged commit dc919f6 into pantsbuild:master Jan 6, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mateor mateor deleted the mateor:mateo.prepare_1.3.0dev6 branch Jan 6, 2017

lenucksi added a commit to lenucksi/pants that referenced this pull request Apr 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.