You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rya.apache.org by Puja Valiyil <pu...@gmail.com> on 2016/08/18 13:00:39 UTC
Status of the release
Hey Aaron and Caleb,
I saw that there was a release branch. Should we hold off on merging
things into develop while you are working on the release? I had put off
merging pull requests while you guys were actively working so that it
wouldn't be adding work, but there are a lot of requests at this point that
should be pulled in. Let me know if its ok to start pulling stuff in or if
that will just add more work to what you all are currently doing.
Thanks,
Puja
Re: Status of the release
Posted by "Aaron D. Mihalik" <aa...@gmail.com>.
yeah, it's unfortunate that it's not "makes it to the PR's target branch".
That "closes #PR" commit comment would be nice.
On Fri, Aug 19, 2016 at 12:13 PM Josh Elser <jo...@gmail.com> wrote:
> That "makes it to master" caveat might be problematic here since you're
> using the gitflow approach (and things only hit master after a release).
> FYI
>
> Sean Busbey wrote:
> > To close a github pr, you have to have a commit that makes it to master
> > with something like "closes #45", where "#45" is the PR number. (Or I
> think
> > if you merge the exact commit hash from the head of the PR branch that'll
> > work).
> >
> > https://help.github.com/articles/closing-issues-via-commit-messages/
> >
> > You can close PRs that are spurious by pushing an empty commit to master
> > with similar language. I usually try to include a reasoning.
> >
> >
> >
> > On Thu, Aug 18, 2016 at 8:53 AM, Aaron D. Mihalik<
> aaron.mihalik@gmail.com>
> > wrote:
> >
> >> Puja are you still using the "Commit Process for Committers"
> instructions
> >> at [1]? Can you take a look at these instructions and figure out why
> they
> >> are not closing the pull requests?
> >>
> >> It would be worth it to see how spark is pulling stuff in. Their PRs
> look
> >> nice: https://github.com/apache/spark/pull/14695
> >>
> >> [1] https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya
> >>
> >> On Thu, Aug 18, 2016 at 9:14 AM Aaron D. Mihalik<
> aaron.mihalik@gmail.com>
> >> wrote:
> >>
> >>> Go ahead and pull in changes. That branch is in a bad state and will
> be
> >>> deleted. Caleb and I will resume the release today.
> >>>
> >>> On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil<pu...@gmail.com>
> wrote:
> >>>
> >>>> Hey Aaron and Caleb,
> >>>> I saw that there was a release branch. Should we hold off on merging
> >>>> things into develop while you are working on the release? I had put
> off
> >>>> merging pull requests while you guys were actively working so that it
> >>>> wouldn't be adding work, but there are a lot of requests at this point
> >>>> that
> >>>> should be pulled in. Let me know if its ok to start pulling stuff in
> or
> >>>> if
> >>>> that will just add more work to what you all are currently doing.
> >>>> Thanks,
> >>>> Puja
> >>>>
> >
> >
> >
>
Re: Status of the release
Posted by Josh Elser <jo...@gmail.com>.
That "makes it to master" caveat might be problematic here since you're
using the gitflow approach (and things only hit master after a release). FYI
Sean Busbey wrote:
> To close a github pr, you have to have a commit that makes it to master
> with something like "closes #45", where "#45" is the PR number. (Or I think
> if you merge the exact commit hash from the head of the PR branch that'll
> work).
>
> https://help.github.com/articles/closing-issues-via-commit-messages/
>
> You can close PRs that are spurious by pushing an empty commit to master
> with similar language. I usually try to include a reasoning.
>
>
>
> On Thu, Aug 18, 2016 at 8:53 AM, Aaron D. Mihalik<aa...@gmail.com>
> wrote:
>
>> Puja are you still using the "Commit Process for Committers" instructions
>> at [1]? Can you take a look at these instructions and figure out why they
>> are not closing the pull requests?
>>
>> It would be worth it to see how spark is pulling stuff in. Their PRs look
>> nice: https://github.com/apache/spark/pull/14695
>>
>> [1] https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya
>>
>> On Thu, Aug 18, 2016 at 9:14 AM Aaron D. Mihalik<aa...@gmail.com>
>> wrote:
>>
>>> Go ahead and pull in changes. That branch is in a bad state and will be
>>> deleted. Caleb and I will resume the release today.
>>>
>>> On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil<pu...@gmail.com> wrote:
>>>
>>>> Hey Aaron and Caleb,
>>>> I saw that there was a release branch. Should we hold off on merging
>>>> things into develop while you are working on the release? I had put off
>>>> merging pull requests while you guys were actively working so that it
>>>> wouldn't be adding work, but there are a lot of requests at this point
>>>> that
>>>> should be pulled in. Let me know if its ok to start pulling stuff in or
>>>> if
>>>> that will just add more work to what you all are currently doing.
>>>> Thanks,
>>>> Puja
>>>>
>
>
>
Re: Status of the release
Posted by Sean Busbey <se...@gmail.com>.
To close a github pr, you have to have a commit that makes it to master
with something like "closes #45", where "#45" is the PR number. (Or I think
if you merge the exact commit hash from the head of the PR branch that'll
work).
https://help.github.com/articles/closing-issues-via-commit-messages/
You can close PRs that are spurious by pushing an empty commit to master
with similar language. I usually try to include a reasoning.
On Thu, Aug 18, 2016 at 8:53 AM, Aaron D. Mihalik <aa...@gmail.com>
wrote:
> Puja are you still using the "Commit Process for Committers" instructions
> at [1]? Can you take a look at these instructions and figure out why they
> are not closing the pull requests?
>
> It would be worth it to see how spark is pulling stuff in. Their PRs look
> nice: https://github.com/apache/spark/pull/14695
>
> [1] https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya
>
> On Thu, Aug 18, 2016 at 9:14 AM Aaron D. Mihalik <aa...@gmail.com>
> wrote:
>
> > Go ahead and pull in changes. That branch is in a bad state and will be
> > deleted. Caleb and I will resume the release today.
> >
> > On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil <pu...@gmail.com> wrote:
> >
> >> Hey Aaron and Caleb,
> >> I saw that there was a release branch. Should we hold off on merging
> >> things into develop while you are working on the release? I had put off
> >> merging pull requests while you guys were actively working so that it
> >> wouldn't be adding work, but there are a lot of requests at this point
> >> that
> >> should be pulled in. Let me know if its ok to start pulling stuff in or
> >> if
> >> that will just add more work to what you all are currently doing.
> >> Thanks,
> >> Puja
> >>
> >
>
--
Sean
Re: Status of the release
Posted by Puja Valiyil <pu...@gmail.com>.
Yes, I follow the commit process exactly (even running rat multiple
times). I think github gets confused with the rebasing from develop in the
commit process -- the pull requests where there aren't any chronological
changes that occur later that have already been merged typically get closed.
On Thu, Aug 18, 2016 at 9:53 AM, Aaron D. Mihalik <aa...@gmail.com>
wrote:
> Puja are you still using the "Commit Process for Committers" instructions
> at [1]? Can you take a look at these instructions and figure out why they
> are not closing the pull requests?
>
> It would be worth it to see how spark is pulling stuff in. Their PRs look
> nice: https://github.com/apache/spark/pull/14695
>
> [1] https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya
>
> On Thu, Aug 18, 2016 at 9:14 AM Aaron D. Mihalik <aa...@gmail.com>
> wrote:
>
> > Go ahead and pull in changes. That branch is in a bad state and will be
> > deleted. Caleb and I will resume the release today.
> >
> > On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil <pu...@gmail.com> wrote:
> >
> >> Hey Aaron and Caleb,
> >> I saw that there was a release branch. Should we hold off on merging
> >> things into develop while you are working on the release? I had put off
> >> merging pull requests while you guys were actively working so that it
> >> wouldn't be adding work, but there are a lot of requests at this point
> >> that
> >> should be pulled in. Let me know if its ok to start pulling stuff in or
> >> if
> >> that will just add more work to what you all are currently doing.
> >> Thanks,
> >> Puja
> >>
> >
>
Re: Status of the release
Posted by "Aaron D. Mihalik" <aa...@gmail.com>.
Puja are you still using the "Commit Process for Committers" instructions
at [1]? Can you take a look at these instructions and figure out why they
are not closing the pull requests?
It would be worth it to see how spark is pulling stuff in. Their PRs look
nice: https://github.com/apache/spark/pull/14695
[1] https://cwiki.apache.org/confluence/display/RYA/Contributing+to+Rya
On Thu, Aug 18, 2016 at 9:14 AM Aaron D. Mihalik <aa...@gmail.com>
wrote:
> Go ahead and pull in changes. That branch is in a bad state and will be
> deleted. Caleb and I will resume the release today.
>
> On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil <pu...@gmail.com> wrote:
>
>> Hey Aaron and Caleb,
>> I saw that there was a release branch. Should we hold off on merging
>> things into develop while you are working on the release? I had put off
>> merging pull requests while you guys were actively working so that it
>> wouldn't be adding work, but there are a lot of requests at this point
>> that
>> should be pulled in. Let me know if its ok to start pulling stuff in or
>> if
>> that will just add more work to what you all are currently doing.
>> Thanks,
>> Puja
>>
>
Re: Status of the release
Posted by "Aaron D. Mihalik" <aa...@gmail.com>.
Go ahead and pull in changes. That branch is in a bad state and will be
deleted. Caleb and I will resume the release today.
On Thu, Aug 18, 2016 at 9:00 AM Puja Valiyil <pu...@gmail.com> wrote:
> Hey Aaron and Caleb,
> I saw that there was a release branch. Should we hold off on merging
> things into develop while you are working on the release? I had put off
> merging pull requests while you guys were actively working so that it
> wouldn't be adding work, but there are a lot of requests at this point that
> should be pulled in. Let me know if its ok to start pulling stuff in or if
> that will just add more work to what you all are currently doing.
> Thanks,
> Puja
>