Yes that would be it. I'm not sure about fully automating step 5, but in Apache Storm they have a script that we could reuse that generates the command line for pushing to the asf repo:
https://issues.apache.org/jira/browse/STORM-626 Matthieu On Thu, Jan 15, 2015 at 6:14 PM, Gianmarco De Francisci Morales <[email protected]> wrote: > Sounds very sensible. > So the flow would be: > 1) Create Jira issue > 2) Create PR on GitHub > 3) Mention Jira issue on the PR > 4) Merge PR on GitHub > 5) Push the changes back to the ASF git repo (?) > > If we could automate 5 then the only change to the current process would be > to create Jira issues, which is very lightweight. > I'd be very happy with it. > > > -- > Gianmarco > > On 15 January 2015 at 15:08, Matthieu Morel <[email protected]> wrote: > >> Hi, >> >> I'd prefer to use github's pull request features: >> >> asf infra and github are now tightly integrated (see: >> >> https://blogs.apache.org/infra/entry/improved_integration_between_apache_and >> ). >> >> This means it is possible to use github's features to submit pull >> requests, which can be reviewed on github, voted upon, then merged >> into the asf git repo. As far as I understand, for the integration to >> happen on a particular issue, one just needs to first create a Jira >> ticket and reference it from the github PR. >> >> Jira remains the central place for handling tickets. The asf git repo >> remains the source of truth for the codebase. >> >> It's alway possible to accept git diffs (properly generated), but in >> my view, accepting PRs through Github looks like the most convenient >> way to handle contributions. Apache Storm and Apache Helix for >> instance already take advantage of this integration. >> >> Once a PR is accepted, apparently a committer must manually push the >> patch to the asf repo , though maybe this can be automated. >> >> Matthieu >> >> >> On Thu, Jan 15, 2015 at 12:52 PM, Gianmarco De Francisci Morales >> <[email protected]> wrote: >> > Hi, >> > >> > I wanted to discuss about how we will handle contributing code to SAMOA. >> > In other projects, the typical Apache voting process is to require two >> +1's >> > for code contributed by other people, and one +1 for code developed by a >> > contributor. >> > Voting happens on the Jira tracking the issue, and each code change is >> > associated with a Jira issue. >> > I think that's a reasonable way to do it. >> > >> > I don't have much experience on how to handle things with git in this >> > process though. >> > Should we attach diffs to the Jira anyway? What about pull requests on >> the >> > GitHub mirror? >> > Maybe Matthieu can help us here, as S4 was already using git. >> > >> > Cheers, >> > -- >> > Gianmarco >>
