You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Swapnil M Mane <sw...@apache.org> on 2019/08/24 04:32:31 UTC
Two branches on Roller website repository
Hello team,
We have two branches master, and asf-site on Roller website repository [1]
The asf-site branch is deployed at Roller official site [2].
This brings us the overhead of maintaining two branches.
Most of the Apache projects [3][4] are maintaining single asf-site branch.
It seems me, the reason for two branches are
master - default created in Git
asf-site - created for deploying official Roller site [2]
So, to reduce the overhead of maintaining two branches,
1. we can make master as Stale (as done for Flink[4]) and
2. make the asf-site branch as the default branch.
Please let me know if I am missing any information or history for
maintaining two branches.
[1] https://github.com/apache/roller-website/
[2] http://roller.apache.org/
[3] https://github.com/apache/spark-website/branches
[4] https://github.com/apache/flink-web/branches
Best regards,
Swapnil M Mane,
www.apache.org
Re: Two branches on Roller website repository
Posted by Aditya Sharma <ad...@apache.org>.
Done. https://github.com/apache/roller-website
--
Thanks & Regards,
Aditya Sharma
On Wed, 6 Nov 2019 at 12:12, Aditya Sharma <ad...@apache.org> wrote:
> I will wait for a day and delete master if no one against it. I find no
> reason having two branch for website from which one is of no value.
>
> Thanks and regards,
> Aditya Sharma
>
> On Mon, 23 Sep 2019 at 15:42, Swapnil M Mane <sw...@apache.org>
> wrote:
>
>> Here is response from Gavin on
>> https://issues.apache.org/jira/browse/INFRA-19115
>> >>>> A branch goes stale automatically after a period of no commits, I
>> dont think one can force it to be.
>>
>> Thus if we don't commit anything on master for long time it will go
>> Stale automatically. So we are all set now.
>>
>> For deleting the master branch,
>> I am not having any strong opinion on this, fine with everything that
>> community decide. :-)
>>
>> Best regards,
>> Swapnil M Mane,
>> www.apache.org
>>
>> On Mon, Sep 23, 2019 at 2:10 PM Aditya Sharma <ad...@apache.org>
>> wrote:
>> >
>> > Thanks Swapnil!
>> >
>> > I was wondering why not we delete the master branch as done in these[1]
>> [2]
>> > [3] projects.
>> >
>> > 1. https://github.com/apache/spark-website/branches
>> > 2. https://github.com/apache/storm-site/branches
>> > 3. https://github.com/apache/plc4x-website/branches
>> >
>> > Thanks and Regards,
>> > Aditya Sharma
>> >
>> > On Fri, 20 Sep 2019 at 17:45, Swapnil M Mane <sw...@apache.org>
>> > wrote:
>> >
>> > > Our INFRA team is super quick :-)
>> > > The 'asf-site' is now the default branch of roller-website repository
>> > > https://github.com/apache/roller-website/branches
>> > >
>> > > I have updated the website build instructions as per this change at
>> > > commit revision #fb0710bc5
>> > > https://github.com/apache/roller-website/commit/fb0710bc5
>> > > http://roller.apache.org/getinvolved/edit_website.html
>> > >
>> > > Now we will no longer maintain the master branch in this repository.
>> > >
>> > > P.S. The INFRA team didn't mark the 'master' branch 'Stale' yet, I
>> > > requested them again to do the same, still, we good with everything
>> > > done so far :)
>> > >
>> > > Best regards,
>> > > Swapnil M Mane,
>> > > www.apache.org
>> > >
>> > > On Fri, Sep 20, 2019 at 3:37 PM Swapnil M Mane <
>> swapnilmmane@apache.org>
>> > > wrote:
>> > > >
>> > > > Thank you Dave, filed the Jira for INFRA team with this request.
>> > > > https://issues.apache.org/jira/browse/INFRA-19115
>> > > >
>> > > >
>> > > > Best regards,
>> > > > Swapnil M Mane,
>> > > > www.apache.org
>> > > >
>> > > > On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
>> > > > >
>> > > > > Hi Swapnup,
>> > > > >
>> > > > > I think you are right, there is no benefit to maintaining a
>> separate
>> > > master
>> > > > > branch since we have no way to stage changes before publishing.
>> So I'm
>> > > +1
>> > > > > on your proposed change.
>> > > > >
>> > > > > Thanks,
>> > > > > Dave
>> > > > >
>> > > > >
>> > > > > On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <
>> > > swapnilmmane@apache.org>
>> > > > > wrote:
>> > > > >
>> > > > > > Hello team,
>> > > > > >
>> > > > > > We have two branches master, and asf-site on Roller website
>> > > repository [1]
>> > > > > > The asf-site branch is deployed at Roller official site [2].
>> > > > > >
>> > > > > > This brings us the overhead of maintaining two branches.
>> > > > > > Most of the Apache projects [3][4] are maintaining single
>> asf-site
>> > > branch.
>> > > > > >
>> > > > > > It seems me, the reason for two branches are
>> > > > > > master - default created in Git
>> > > > > > asf-site - created for deploying official Roller site [2]
>> > > > > >
>> > > > > > So, to reduce the overhead of maintaining two branches,
>> > > > > > 1. we can make master as Stale (as done for Flink[4]) and
>> > > > > > 2. make the asf-site branch as the default branch.
>> > > > > >
>> > > > > > Please let me know if I am missing any information or history
>> for
>> > > > > > maintaining two branches.
>> > > > > >
>> > > > > > [1] https://github.com/apache/roller-website/
>> > > > > > [2] http://roller.apache.org/
>> > > > > > [3] https://github.com/apache/spark-website/branches
>> > > > > > [4] https://github.com/apache/flink-web/branches
>> > > > > >
>> > > > > > Best regards,
>> > > > > > Swapnil M Mane,
>> > > > > > www.apache.org
>> > > > > >
>> > >
>>
>
Re: Two branches on Roller website repository
Posted by Aditya Sharma <ad...@apache.org>.
I will wait for a day and delete master if no one against it. I find no
reason having two branch for website from which one is of no value.
Thanks and regards,
Aditya Sharma
On Mon, 23 Sep 2019 at 15:42, Swapnil M Mane <sw...@apache.org>
wrote:
> Here is response from Gavin on
> https://issues.apache.org/jira/browse/INFRA-19115
> >>>> A branch goes stale automatically after a period of no commits, I
> dont think one can force it to be.
>
> Thus if we don't commit anything on master for long time it will go
> Stale automatically. So we are all set now.
>
> For deleting the master branch,
> I am not having any strong opinion on this, fine with everything that
> community decide. :-)
>
> Best regards,
> Swapnil M Mane,
> www.apache.org
>
> On Mon, Sep 23, 2019 at 2:10 PM Aditya Sharma <ad...@apache.org>
> wrote:
> >
> > Thanks Swapnil!
> >
> > I was wondering why not we delete the master branch as done in these[1]
> [2]
> > [3] projects.
> >
> > 1. https://github.com/apache/spark-website/branches
> > 2. https://github.com/apache/storm-site/branches
> > 3. https://github.com/apache/plc4x-website/branches
> >
> > Thanks and Regards,
> > Aditya Sharma
> >
> > On Fri, 20 Sep 2019 at 17:45, Swapnil M Mane <sw...@apache.org>
> > wrote:
> >
> > > Our INFRA team is super quick :-)
> > > The 'asf-site' is now the default branch of roller-website repository
> > > https://github.com/apache/roller-website/branches
> > >
> > > I have updated the website build instructions as per this change at
> > > commit revision #fb0710bc5
> > > https://github.com/apache/roller-website/commit/fb0710bc5
> > > http://roller.apache.org/getinvolved/edit_website.html
> > >
> > > Now we will no longer maintain the master branch in this repository.
> > >
> > > P.S. The INFRA team didn't mark the 'master' branch 'Stale' yet, I
> > > requested them again to do the same, still, we good with everything
> > > done so far :)
> > >
> > > Best regards,
> > > Swapnil M Mane,
> > > www.apache.org
> > >
> > > On Fri, Sep 20, 2019 at 3:37 PM Swapnil M Mane <
> swapnilmmane@apache.org>
> > > wrote:
> > > >
> > > > Thank you Dave, filed the Jira for INFRA team with this request.
> > > > https://issues.apache.org/jira/browse/INFRA-19115
> > > >
> > > >
> > > > Best regards,
> > > > Swapnil M Mane,
> > > > www.apache.org
> > > >
> > > > On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
> > > > >
> > > > > Hi Swapnup,
> > > > >
> > > > > I think you are right, there is no benefit to maintaining a
> separate
> > > master
> > > > > branch since we have no way to stage changes before publishing. So
> I'm
> > > +1
> > > > > on your proposed change.
> > > > >
> > > > > Thanks,
> > > > > Dave
> > > > >
> > > > >
> > > > > On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <
> > > swapnilmmane@apache.org>
> > > > > wrote:
> > > > >
> > > > > > Hello team,
> > > > > >
> > > > > > We have two branches master, and asf-site on Roller website
> > > repository [1]
> > > > > > The asf-site branch is deployed at Roller official site [2].
> > > > > >
> > > > > > This brings us the overhead of maintaining two branches.
> > > > > > Most of the Apache projects [3][4] are maintaining single
> asf-site
> > > branch.
> > > > > >
> > > > > > It seems me, the reason for two branches are
> > > > > > master - default created in Git
> > > > > > asf-site - created for deploying official Roller site [2]
> > > > > >
> > > > > > So, to reduce the overhead of maintaining two branches,
> > > > > > 1. we can make master as Stale (as done for Flink[4]) and
> > > > > > 2. make the asf-site branch as the default branch.
> > > > > >
> > > > > > Please let me know if I am missing any information or history for
> > > > > > maintaining two branches.
> > > > > >
> > > > > > [1] https://github.com/apache/roller-website/
> > > > > > [2] http://roller.apache.org/
> > > > > > [3] https://github.com/apache/spark-website/branches
> > > > > > [4] https://github.com/apache/flink-web/branches
> > > > > >
> > > > > > Best regards,
> > > > > > Swapnil M Mane,
> > > > > > www.apache.org
> > > > > >
> > >
>
Re: Two branches on Roller website repository
Posted by Swapnil M Mane <sw...@apache.org>.
Here is response from Gavin on https://issues.apache.org/jira/browse/INFRA-19115
>>>> A branch goes stale automatically after a period of no commits, I dont think one can force it to be.
Thus if we don't commit anything on master for long time it will go
Stale automatically. So we are all set now.
For deleting the master branch,
I am not having any strong opinion on this, fine with everything that
community decide. :-)
Best regards,
Swapnil M Mane,
www.apache.org
On Mon, Sep 23, 2019 at 2:10 PM Aditya Sharma <ad...@apache.org> wrote:
>
> Thanks Swapnil!
>
> I was wondering why not we delete the master branch as done in these[1] [2]
> [3] projects.
>
> 1. https://github.com/apache/spark-website/branches
> 2. https://github.com/apache/storm-site/branches
> 3. https://github.com/apache/plc4x-website/branches
>
> Thanks and Regards,
> Aditya Sharma
>
> On Fri, 20 Sep 2019 at 17:45, Swapnil M Mane <sw...@apache.org>
> wrote:
>
> > Our INFRA team is super quick :-)
> > The 'asf-site' is now the default branch of roller-website repository
> > https://github.com/apache/roller-website/branches
> >
> > I have updated the website build instructions as per this change at
> > commit revision #fb0710bc5
> > https://github.com/apache/roller-website/commit/fb0710bc5
> > http://roller.apache.org/getinvolved/edit_website.html
> >
> > Now we will no longer maintain the master branch in this repository.
> >
> > P.S. The INFRA team didn't mark the 'master' branch 'Stale' yet, I
> > requested them again to do the same, still, we good with everything
> > done so far :)
> >
> > Best regards,
> > Swapnil M Mane,
> > www.apache.org
> >
> > On Fri, Sep 20, 2019 at 3:37 PM Swapnil M Mane <sw...@apache.org>
> > wrote:
> > >
> > > Thank you Dave, filed the Jira for INFRA team with this request.
> > > https://issues.apache.org/jira/browse/INFRA-19115
> > >
> > >
> > > Best regards,
> > > Swapnil M Mane,
> > > www.apache.org
> > >
> > > On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
> > > >
> > > > Hi Swapnup,
> > > >
> > > > I think you are right, there is no benefit to maintaining a separate
> > master
> > > > branch since we have no way to stage changes before publishing. So I'm
> > +1
> > > > on your proposed change.
> > > >
> > > > Thanks,
> > > > Dave
> > > >
> > > >
> > > > On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <
> > swapnilmmane@apache.org>
> > > > wrote:
> > > >
> > > > > Hello team,
> > > > >
> > > > > We have two branches master, and asf-site on Roller website
> > repository [1]
> > > > > The asf-site branch is deployed at Roller official site [2].
> > > > >
> > > > > This brings us the overhead of maintaining two branches.
> > > > > Most of the Apache projects [3][4] are maintaining single asf-site
> > branch.
> > > > >
> > > > > It seems me, the reason for two branches are
> > > > > master - default created in Git
> > > > > asf-site - created for deploying official Roller site [2]
> > > > >
> > > > > So, to reduce the overhead of maintaining two branches,
> > > > > 1. we can make master as Stale (as done for Flink[4]) and
> > > > > 2. make the asf-site branch as the default branch.
> > > > >
> > > > > Please let me know if I am missing any information or history for
> > > > > maintaining two branches.
> > > > >
> > > > > [1] https://github.com/apache/roller-website/
> > > > > [2] http://roller.apache.org/
> > > > > [3] https://github.com/apache/spark-website/branches
> > > > > [4] https://github.com/apache/flink-web/branches
> > > > >
> > > > > Best regards,
> > > > > Swapnil M Mane,
> > > > > www.apache.org
> > > > >
> >
Re: Two branches on Roller website repository
Posted by Aditya Sharma <ad...@apache.org>.
Thanks Swapnil!
I was wondering why not we delete the master branch as done in these[1] [2]
[3] projects.
1. https://github.com/apache/spark-website/branches
2. https://github.com/apache/storm-site/branches
3. https://github.com/apache/plc4x-website/branches
Thanks and Regards,
Aditya Sharma
On Fri, 20 Sep 2019 at 17:45, Swapnil M Mane <sw...@apache.org>
wrote:
> Our INFRA team is super quick :-)
> The 'asf-site' is now the default branch of roller-website repository
> https://github.com/apache/roller-website/branches
>
> I have updated the website build instructions as per this change at
> commit revision #fb0710bc5
> https://github.com/apache/roller-website/commit/fb0710bc5
> http://roller.apache.org/getinvolved/edit_website.html
>
> Now we will no longer maintain the master branch in this repository.
>
> P.S. The INFRA team didn't mark the 'master' branch 'Stale' yet, I
> requested them again to do the same, still, we good with everything
> done so far :)
>
> Best regards,
> Swapnil M Mane,
> www.apache.org
>
> On Fri, Sep 20, 2019 at 3:37 PM Swapnil M Mane <sw...@apache.org>
> wrote:
> >
> > Thank you Dave, filed the Jira for INFRA team with this request.
> > https://issues.apache.org/jira/browse/INFRA-19115
> >
> >
> > Best regards,
> > Swapnil M Mane,
> > www.apache.org
> >
> > On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
> > >
> > > Hi Swapnup,
> > >
> > > I think you are right, there is no benefit to maintaining a separate
> master
> > > branch since we have no way to stage changes before publishing. So I'm
> +1
> > > on your proposed change.
> > >
> > > Thanks,
> > > Dave
> > >
> > >
> > > On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <
> swapnilmmane@apache.org>
> > > wrote:
> > >
> > > > Hello team,
> > > >
> > > > We have two branches master, and asf-site on Roller website
> repository [1]
> > > > The asf-site branch is deployed at Roller official site [2].
> > > >
> > > > This brings us the overhead of maintaining two branches.
> > > > Most of the Apache projects [3][4] are maintaining single asf-site
> branch.
> > > >
> > > > It seems me, the reason for two branches are
> > > > master - default created in Git
> > > > asf-site - created for deploying official Roller site [2]
> > > >
> > > > So, to reduce the overhead of maintaining two branches,
> > > > 1. we can make master as Stale (as done for Flink[4]) and
> > > > 2. make the asf-site branch as the default branch.
> > > >
> > > > Please let me know if I am missing any information or history for
> > > > maintaining two branches.
> > > >
> > > > [1] https://github.com/apache/roller-website/
> > > > [2] http://roller.apache.org/
> > > > [3] https://github.com/apache/spark-website/branches
> > > > [4] https://github.com/apache/flink-web/branches
> > > >
> > > > Best regards,
> > > > Swapnil M Mane,
> > > > www.apache.org
> > > >
>
Re: Two branches on Roller website repository
Posted by Swapnil M Mane <sw...@apache.org>.
Our INFRA team is super quick :-)
The 'asf-site' is now the default branch of roller-website repository
https://github.com/apache/roller-website/branches
I have updated the website build instructions as per this change at
commit revision #fb0710bc5
https://github.com/apache/roller-website/commit/fb0710bc5
http://roller.apache.org/getinvolved/edit_website.html
Now we will no longer maintain the master branch in this repository.
P.S. The INFRA team didn't mark the 'master' branch 'Stale' yet, I
requested them again to do the same, still, we good with everything
done so far :)
Best regards,
Swapnil M Mane,
www.apache.org
On Fri, Sep 20, 2019 at 3:37 PM Swapnil M Mane <sw...@apache.org> wrote:
>
> Thank you Dave, filed the Jira for INFRA team with this request.
> https://issues.apache.org/jira/browse/INFRA-19115
>
>
> Best regards,
> Swapnil M Mane,
> www.apache.org
>
> On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
> >
> > Hi Swapnup,
> >
> > I think you are right, there is no benefit to maintaining a separate master
> > branch since we have no way to stage changes before publishing. So I'm +1
> > on your proposed change.
> >
> > Thanks,
> > Dave
> >
> >
> > On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <sw...@apache.org>
> > wrote:
> >
> > > Hello team,
> > >
> > > We have two branches master, and asf-site on Roller website repository [1]
> > > The asf-site branch is deployed at Roller official site [2].
> > >
> > > This brings us the overhead of maintaining two branches.
> > > Most of the Apache projects [3][4] are maintaining single asf-site branch.
> > >
> > > It seems me, the reason for two branches are
> > > master - default created in Git
> > > asf-site - created for deploying official Roller site [2]
> > >
> > > So, to reduce the overhead of maintaining two branches,
> > > 1. we can make master as Stale (as done for Flink[4]) and
> > > 2. make the asf-site branch as the default branch.
> > >
> > > Please let me know if I am missing any information or history for
> > > maintaining two branches.
> > >
> > > [1] https://github.com/apache/roller-website/
> > > [2] http://roller.apache.org/
> > > [3] https://github.com/apache/spark-website/branches
> > > [4] https://github.com/apache/flink-web/branches
> > >
> > > Best regards,
> > > Swapnil M Mane,
> > > www.apache.org
> > >
Re: Two branches on Roller website repository
Posted by Swapnil M Mane <sw...@apache.org>.
Thank you Dave, filed the Jira for INFRA team with this request.
https://issues.apache.org/jira/browse/INFRA-19115
Best regards,
Swapnil M Mane,
www.apache.org
On Sat, Aug 24, 2019 at 11:58 PM Dave <sn...@gmail.com> wrote:
>
> Hi Swapnup,
>
> I think you are right, there is no benefit to maintaining a separate master
> branch since we have no way to stage changes before publishing. So I'm +1
> on your proposed change.
>
> Thanks,
> Dave
>
>
> On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <sw...@apache.org>
> wrote:
>
> > Hello team,
> >
> > We have two branches master, and asf-site on Roller website repository [1]
> > The asf-site branch is deployed at Roller official site [2].
> >
> > This brings us the overhead of maintaining two branches.
> > Most of the Apache projects [3][4] are maintaining single asf-site branch.
> >
> > It seems me, the reason for two branches are
> > master - default created in Git
> > asf-site - created for deploying official Roller site [2]
> >
> > So, to reduce the overhead of maintaining two branches,
> > 1. we can make master as Stale (as done for Flink[4]) and
> > 2. make the asf-site branch as the default branch.
> >
> > Please let me know if I am missing any information or history for
> > maintaining two branches.
> >
> > [1] https://github.com/apache/roller-website/
> > [2] http://roller.apache.org/
> > [3] https://github.com/apache/spark-website/branches
> > [4] https://github.com/apache/flink-web/branches
> >
> > Best regards,
> > Swapnil M Mane,
> > www.apache.org
> >
Re: Two branches on Roller website repository
Posted by Dave <sn...@gmail.com>.
Hi Swapnup,
I think you are right, there is no benefit to maintaining a separate master
branch since we have no way to stage changes before publishing. So I'm +1
on your proposed change.
Thanks,
Dave
On Sat, Aug 24, 2019 at 12:32 AM Swapnil M Mane <sw...@apache.org>
wrote:
> Hello team,
>
> We have two branches master, and asf-site on Roller website repository [1]
> The asf-site branch is deployed at Roller official site [2].
>
> This brings us the overhead of maintaining two branches.
> Most of the Apache projects [3][4] are maintaining single asf-site branch.
>
> It seems me, the reason for two branches are
> master - default created in Git
> asf-site - created for deploying official Roller site [2]
>
> So, to reduce the overhead of maintaining two branches,
> 1. we can make master as Stale (as done for Flink[4]) and
> 2. make the asf-site branch as the default branch.
>
> Please let me know if I am missing any information or history for
> maintaining two branches.
>
> [1] https://github.com/apache/roller-website/
> [2] http://roller.apache.org/
> [3] https://github.com/apache/spark-website/branches
> [4] https://github.com/apache/flink-web/branches
>
> Best regards,
> Swapnil M Mane,
> www.apache.org
>