Re: Github pull requests

[Felix Cheung]

Re JIRA - the merge PR script in Spark closes the JIRA automatically..

_
From: Julian Hyde 
Sent: Wednesday, February 21, 2018 8:46 PM
Subject: Re: Github pull requests
To: Jonas Pfefferle 
Cc: , Patrick Stuedi 


I believe that there are tools to do git / CI / JIRA integration. Spark is one 
of the projects with the most integration. Search their lists and JIRA to find 
out how they did it.

Speaking for my own project: Calcite doesn’t have very much integration because 
we don’t have spare cycles to research and troubleshoot. A documented manual 
process suffices.

Julian


> On Feb 21, 2018, at 2:26 AM, Jonas Pfefferle  wrote:
>
> We just closed our first pull request and where wondering if there is also a 
> way to automatically close the corresponding JIRA ticket? Also is there a way 
> we can technically enforce that we have a certain amount of people who 
> approved the code? Or do we have to do this informally?
>
> Thanks,
> Jonas
>
> On Wed, 14 Feb 2018 10:53:04 -0800
> Julian Hyde  wrote:
>> The nice thing about git is that every git repo is capable of being a master 
>> / slave. (The ASF git repo is special only in that it gathers audit logs 
>> when people push to it, e.g. the IP address where the push came from. Those 
>> logs will be useful if the provenance of our IP is ever challenged.)
>> So, the merging doesn’t happen on the GitHub repo. It happens in the repo on 
>> your laptop. Before merging, you pull the latest from the apache master 
>> branch (it doesn’t matter whether this comes from the GitHub mirror or the 
>> ASF repo - it is bitwise identical, as the commit SHAs will attest), and you 
>> pull from a GitHub repo the commit(s) referenced in the GitHub PR. You 
>> append these commits to the commit chain, test, then push to the ASF master 
>> branch.
>> If you add ‘Close #NN’ to the commit comments (and you generally will), an 
>> ASF commit hook will close PR #NN at the time that the commit arrives in ASF 
>> git.
>> Julian
>>> On Feb 14, 2018, at 6:59 AM, Jonas Pfefferle  wrote:
>>> I think you are missing a 3rd option:
>>> Basically option 1) but we merge the pull request on github and push the 
>>> changes to the apache git. So no need to delete the PRs. However we have to 
>>> be careful to only commit changes to github to not get the histories out of 
>>> sync.
>>> Jonas
>>> On Wed, 14 Feb 2018 13:58:58 +0100
>>> Patrick Stuedi  wrote:
 Hi all,
 If the github repo is synced with git repo only in one direction, then
 what is the recommended way to handle new code contributions
 (including code reviews)? We see two options here:
 1) Code contributions are issued as PRs on the Crail Apache github
 (and reviewed there), then merged outside in a private repo and
 committed back to the Apache git repo (the PR may need to be deleted
 once the commit has happened), from where the Apache Crail github repo
 will again pick it up (sync).
 2) We don't use the git repo at all, only the github repo. PRs are
 reviewed and merged directly at the github level.
 Option (1) looks complicated, option (2) might not be according to the
 Apache policies (?). What is the recommended way?
 -Patrick
 On Mon, Feb 12, 2018 at 5:25 PM, Julian Hyde  
 wrote:
> No.
> Julian
>> On Feb 12, 2018, at 08:03, Jonas Pfefferle  wrote:
>> Hi @all,
>> Is the Apache Crail github repository synced both ways with the Apache 
>> Crail git? I.e. can we merge pull request in github?
>> Regards,
>> Jonas
>

Re: Github pull requests

[Julian Hyde]

I believe that there are tools to do git / CI / JIRA integration. Spark is one 
of the projects with the most integration. Search their lists and JIRA to find 
out how they did it.

Speaking for my own project: Calcite doesn’t have very much integration because 
we don’t have spare cycles to research and troubleshoot. A documented manual 
process suffices.

Julian


> On Feb 21, 2018, at 2:26 AM, Jonas Pfefferle  wrote:
> 
> We just closed our first pull request and where wondering if there is also a 
> way to automatically close the corresponding JIRA ticket? Also is there a way 
> we can technically enforce that we have a certain amount of people who 
> approved the code? Or do we have to do this informally?
> 
> Thanks,
> Jonas
> 
> On Wed, 14 Feb 2018 10:53:04 -0800
> Julian Hyde  wrote:
>> The nice thing about git is that every git repo is capable of being a master 
>> / slave. (The ASF git repo is special only in that it gathers audit logs 
>> when people push to it, e.g. the IP address where the push came from. Those 
>> logs will be useful if the provenance of our IP is ever challenged.)
>> So, the merging doesn’t happen on the GitHub repo. It happens in the repo on 
>> your laptop. Before merging, you pull the latest from the apache master 
>> branch (it doesn’t matter whether this comes from the GitHub mirror or the 
>> ASF repo - it is bitwise identical, as the commit SHAs will attest), and you 
>> pull from a GitHub repo the commit(s) referenced in the  GitHub PR. You 
>> append these commits to the commit chain, test, then push to the ASF master 
>> branch.
>> If you add ‘Close #NN’ to the commit comments (and you generally will), an 
>> ASF commit hook will close PR #NN at the time that the commit arrives in ASF 
>> git.
>> Julian
>>> On Feb 14, 2018, at 6:59 AM, Jonas Pfefferle  wrote:
>>> I think you are missing a 3rd option:
>>> Basically option 1) but we merge the pull request on github and push the 
>>> changes to the apache git. So no need to delete the PRs. However we have to 
>>> be careful to only commit changes to github to not get the histories out of 
>>> sync.
>>> Jonas
>>> On Wed, 14 Feb 2018 13:58:58 +0100
>>> Patrick Stuedi  wrote:
 Hi all,
 If the github repo is synced with git repo only in one direction, then
 what is the recommended way to handle new code contributions
 (including code reviews)? We see two options here:
 1) Code contributions are issued as PRs on the Crail Apache github
 (and reviewed there), then merged outside in a private repo and
 committed back to the Apache git repo (the PR may need to be deleted
 once the commit has happened), from where the Apache Crail github repo
 will again pick it up (sync).
 2) We don't use the git repo at all, only the github repo. PRs are
 reviewed and merged directly at the github level.
 Option (1) looks complicated, option (2) might not be according to the
 Apache policies (?). What is the recommended way?
 -Patrick
 On Mon, Feb 12, 2018 at 5:25 PM, Julian Hyde  
 wrote:
> No.
> Julian
>> On Feb 12, 2018, at 08:03, Jonas Pfefferle  wrote:
>> Hi @all,
>> Is the Apache Crail github repository synced both ways with the Apache 
>> Crail git? I.e. can we merge pull request in github?
>> Regards,
>> Jonas
> 

[GitHub] incubator-crail pull request #1: Fixing CRAIL-4 JIRA ticket

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-crail/pull/1


---

Re: JIRA access

[Julian Hyde]

I tried, it seems I’m not a JIRA admin. Luciano, can you please give me admin 
privs?

Would one of the PPMC like admin privs also?

Julian


> On Feb 21, 2018, at 5:13 AM, Jonas Pfefferle  wrote:
> 
> Can anyone give me access to the Crail JIRA? It seems like I can only 
> comment. My apache id is pepperjo.
> 
> Thanks
> Jonas
> 

[GitHub] incubator-crail pull request #2: Updating README.md, how to contribute to Cr...

[animeshtrivedi]

GitHub user animeshtrivedi opened a pull request:

https://github.com/apache/incubator-crail/pull/2

Updating README.md, how to contribute to Crail

The website is also updated.

This closes #5

Signed-off-by: Animesh Trivedi 

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/animeshtrivedi/incubator-crail CRAIL-5

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-crail/pull/2.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #2


commit 177cef84f5c04d48fe858356488cecb46648c278
Author: Animesh Trivedi 
Date:   2018-02-21T12:46:27Z

Updating README.md, how to contribute to Crail

The website is also updated.

This closes #5

Signed-off-by: Animesh Trivedi 




---

[GitHub] incubator-crail pull request #3: [BUILD] Moving the default build to hadoop ...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-crail/pull/3


---

Re: Key access git

[Julian Hyde]

Yes. Set up your SSH keys at https://id.apache.org/ .

> On Feb 21, 2018, at 7:58 AM, Jonas Pfefferle  wrote:
> 
> Hi @all,
> 
> Is there a way to use key access for the apache git?
> 
> Thanks,
> Jonas
> 

Key access git

[Jonas Pfefferle]

Hi @all,

Is there a way to use key access for the apache git?

Thanks,
Jonas

JIRA access

[Jonas Pfefferle]

Can anyone give me access to the Crail JIRA? It seems like I can only 
comment. My apache id is pepperjo.


Thanks
Jonas

Re: Github pull requests

[Jonas Pfefferle]

We just closed our first pull request and where wondering if there is also a 
way to automatically close the corresponding JIRA ticket? Also is there a 
way we can technically enforce that we have a certain amount of people who 
approved the code? Or do we have to do this informally?


Thanks,
Jonas

 On Wed, 14 Feb 2018 10:53:04 -0800
 Julian Hyde  wrote:
The nice thing about git is that every git repo is capable of being 
a master / slave. (The ASF git repo is special only in that it 
gathers audit logs when people push to it, e.g. the IP address where 
the push came from. Those logs will be useful if the provenance of 
our IP is ever challenged.)


So, the merging doesn’t happen on the GitHub repo. It happens in the 
repo on your laptop. Before merging, you pull the latest from the 
apache master branch (it doesn’t matter whether this comes from the 
GitHub mirror or the ASF repo - it is bitwise identical, as the 
commit SHAs will attest), and you pull from a GitHub repo the 
commit(s) referenced in the  GitHub PR. You append these commits to 
the commit chain, test, then push to the ASF master branch.


If you add ‘Close #NN’ to the commit comments (and you generally 
will), an ASF commit hook will close PR #NN at the time that the 
commit arrives in ASF git.


Julian


On Feb 14, 2018, at 6:59 AM, Jonas Pfefferle  
wrote:


I think you are missing a 3rd option:

Basically option 1) but we merge the pull request on github and push 
the changes to the apache git. So no need to delete the PRs. However 
we have to be careful to only commit changes to github to not get the 
histories out of sync.


Jonas

On Wed, 14 Feb 2018 13:58:58 +0100
Patrick Stuedi  wrote:

Hi all,
If the github repo is synced with git repo only in one direction, 
then

what is the recommended way to handle new code contributions
(including code reviews)? We see two options here:
1) Code contributions are issued as PRs on the Crail Apache github
(and reviewed there), then merged outside in a private repo and
committed back to the Apache git repo (the PR may need to be deleted
once the commit has happened), from where the Apache Crail github 
repo

will again pick it up (sync).
2) We don't use the git repo at all, only the github repo. PRs are
reviewed and merged directly at the github level.
Option (1) looks complicated, option (2) might not be according to 
the

Apache policies (?). What is the recommended way?
-Patrick
On Mon, Feb 12, 2018 at 5:25 PM, Julian Hyde 
 wrote:

No.

Julian


On Feb 12, 2018, at 08:03, Jonas Pfefferle  wrote:

Hi @all,

Is the Apache Crail github repository synced both ways with the 
Apache Crail git? I.e. can we merge pull request in github?


Regards,
Jonas