You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apisix.apache.org by Zexuan Luo <sp...@apache.org> on 2020/10/13 04:11:06 UTC
[DISCUSS] Maintain multiple branches of apisix
Since we are going to release a new major version and nowadays we have
plenty of users, I think it is time to bring out a serious multiple
branches maintain mechanism.
The mechanism will contain three kinds of branches:
1. master branch (the branch we submit all commits to)
2. release branch (the latest release, like the ongoing 2.0)
3. LTS branch (the highest minor number of release in the previous major
release, like 1.5)
All PRs are still going to the master branch.
Bugfix will be manually ported to release branch by the maintainer.
We will create a rc release on the release branch first, then create a
formal release a month later.
Before the next minor release is created, we will create a patch release
each month(2.0.1, 2.0.2, ...).
We will back port some important bugfix, for instance, security bugfix and
bugfix users required, to the LTS branch.
A new patch release will be created based on the LTS branch each three
months(1.5.1, 1.5.2, ...).
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Zhang Chao <zc...@gmail.com>.
So What about just maintaining the last one or two releases besides the master branch?
Bugfixs and Security vulnerabilities can be backported? Just like the Go repository.
Chao Zhang
zchao1995@gmail.com
> On Oct 13, 2020, at 11:53 PM, Ming Wen <we...@apache.org> wrote:
>
>> 2. release branch (the latest release, like the ongoing 2.0)
> I don't think we need the release branch, because we already have apache
> release packages and git tags.
>
>> 3. LTS branch (the highest minor number of release in the previous major
> release, like 1.5)
> How long does LTS need to be maintained? One year or two years? And 1.5 is
> not a version suitable for long-term maintenance, etcd v2 will be obsolete
> soon.
>
>> Bugfix will be manually ported to release branch by the maintainer.
> Apache APISIX does not have the role of maintainer.
>
> Thanks,
> Ming Wen, Apache APISIX & Apache SkyWalking
> Twitter: _WenMing
>
>
> YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
>
>> I think we can start to use this way after we release `2.0rc`.
>>
>> ^_^
>>
>>
>> On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
>>
>>> +1, it's very friendly to users.
>>>
>>>
>>>
>>> 88786912@qq.com
>>>
>>> From: Zexuan Luo
>>> Date: 2020-10-13 12:11
>>> To: dev
>>> Subject: [DISCUSS] Maintain multiple branches of apisix
>>> Since we are going to release a new major version and nowadays we have
>>> plenty of users, I think it is time to bring out a serious multiple
>>> branches maintain mechanism.
>>>
>>> The mechanism will contain three kinds of branches:
>>> 1. master branch (the branch we submit all commits to)
>>> 2. release branch (the latest release, like the ongoing 2.0)
>>> 3. LTS branch (the highest minor number of release in the previous major
>>> release, like 1.5)
>>>
>>> All PRs are still going to the master branch.
>>>
>>> Bugfix will be manually ported to release branch by the maintainer.
>>> We will create a rc release on the release branch first, then create a
>>> formal release a month later.
>>> Before the next minor release is created, we will create a patch release
>>> each month(2.0.1, 2.0.2, ...).
>>>
>>> We will back port some important bugfix, for instance, security bugfix
>> and
>>> bugfix users required, to the LTS branch.
>>> A new patch release will be created based on the LTS branch each three
>>> months(1.5.1, 1.5.2, ...).
>>>
>>
>>
>> --
>>
>> *MembPhis*
>> My GitHub: https://github.com/membphis
>> Apache APISIX: https://github.com/apache/apisix
>>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Ming Wen <we...@apache.org>.
For middleware projects, users should be encouraged to upgrade to the
latest version,
not the version a few years ago, because the changes are too big.
Thanks,
Ming Wen, Apache APISIX & Apache SkyWalking
Twitter: _WenMing
JunXu Chen <ch...@apache.org> 于2020年10月19日周一 上午9:24写道：
> I think the LTS version should only be released when necessary, not
> regularly.
>
> On Sun, Oct 18, 2020 at 3:49 PM Sheng Wu <wu...@gmail.com>
> wrote:
>
> > My 0.2 about the LTS version, usually LTS is about the feature stable
> > version focusing on bugfix, which is rare to see for middleware or
> > component. The platform prefers this.
> > Mostly, people do compatible upgrades.
> >
> > Sheng Wu 吴晟
> > Twitter, wusheng1108
> >
> >
> > Ming Wen <we...@apache.org> 于2020年10月18日周日 下午3:36写道：
> >
> > > Apache APISIX releases a version every month, so I don’t think we have
> > the
> > > energy to maintain and release the LTS version
> > >
> > > Thanks,
> > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > Twitter: _WenMing
> > >
> > >
> > > vincixu <vi...@apache.org> 于2020年10月18日周日 上午9:39写道：
> > >
> > > > LTS branch is looks good for me.
> > > > But I think we do not need "release branch", this will increase the
> > > > maintenance cost of the repository and the possibility of release
> > errors
> > > > (because the operation becomes more complex), but in fact it does not
> > > bring
> > > > much more than the tag-based management model benefit
> > > >
> > > > Ming Wen <we...@apache.org> 于2020年10月15日周四 下午5:37写道：
> > > >
> > > > > We recommend users to use Apache release, then how to release the
> > > version
> > > > > of LTS branch?
> > > > >
> > > > > Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
> > > > >
> > > > > > > I don't think we need the release branch, because we already
> have
> > > > > apache
> > > > > > release packages and git tags.
> > > > > >
> > > > > > The `release` branch is not a branch called release, but the
> branch
> > > > > starts
> > > > > > from the release tag, like LuaJIT's branch v2.0:
> > > > > > https://github.com/LuaJIT/LuaJIT/tree/v2.0
> > > > > >
> > > > > > > How long does LTS need to be maintained? One year or two years?
> > > > > >
> > > > > > I vote for two years.
> > > > > >
> > > > > > > And 1.5 is not a version suitable for long-term maintenance
> > > > > >
> > > > > > We can start to do it from 2.x when we have released 3.0
> > > > > >
> > > > > > > Apache APISIX does not have the role of maintainer
> > > > > >
> > > > > > The `maintainer` is not a position, it can be anyone who have the
> > > time
> > > > > (or
> > > > > > who wrote the code caused the bug).
> > > > > >
> > > > > >
> > > > > >
> > > > > > Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> > > > > >
> > > > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > > > I don't think we need the release branch, because we already
> have
> > > > > apache
> > > > > > > release packages and git tags.
> > > > > > >
> > > > > > > > 3. LTS branch (the highest minor number of release in the
> > > previous
> > > > > > major
> > > > > > > release, like 1.5)
> > > > > > > How long does LTS need to be maintained? One year or two years?
> > And
> > > > 1.5
> > > > > > is
> > > > > > > not a version suitable for long-term maintenance, etcd v2 will
> be
> > > > > > obsolete
> > > > > > > soon.
> > > > > > >
> > > > > > > > Bugfix will be manually ported to release branch by the
> > > maintainer.
> > > > > > > Apache APISIX does not have the role of maintainer.
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > > > > Twitter: _WenMing
> > > > > > >
> > > > > > >
> > > > > > > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> > > > > > >
> > > > > > > > I think we can start to use this way after we release
> `2.0rc`.
> > > > > > > >
> > > > > > > > ^_^
> > > > > > > >
> > > > > > > >
> > > > > > > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com>
> wrote:
> > > > > > > >
> > > > > > > > > +1, it's very friendly to users.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > 88786912@qq.com
> > > > > > > > >
> > > > > > > > > From: Zexuan Luo
> > > > > > > > > Date: 2020-10-13 12:11
> > > > > > > > > To: dev
> > > > > > > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > > > > > > Since we are going to release a new major version and
> > nowadays
> > > we
> > > > > > have
> > > > > > > > > plenty of users, I think it is time to bring out a serious
> > > > multiple
> > > > > > > > > branches maintain mechanism.
> > > > > > > > >
> > > > > > > > > The mechanism will contain three kinds of branches:
> > > > > > > > > 1. master branch (the branch we submit all commits to)
> > > > > > > > > 2. release branch (the latest release, like the ongoing
> 2.0)
> > > > > > > > > 3. LTS branch (the highest minor number of release in the
> > > > previous
> > > > > > > major
> > > > > > > > > release, like 1.5)
> > > > > > > > >
> > > > > > > > > All PRs are still going to the master branch.
> > > > > > > > >
> > > > > > > > > Bugfix will be manually ported to release branch by the
> > > > maintainer.
> > > > > > > > > We will create a rc release on the release branch first,
> then
> > > > > create
> > > > > > a
> > > > > > > > > formal release a month later.
> > > > > > > > > Before the next minor release is created, we will create a
> > > patch
> > > > > > > release
> > > > > > > > > each month(2.0.1, 2.0.2, ...).
> > > > > > > > >
> > > > > > > > > We will back port some important bugfix, for instance,
> > security
> > > > > > bugfix
> > > > > > > > and
> > > > > > > > > bugfix users required, to the LTS branch.
> > > > > > > > > A new patch release will be created based on the LTS branch
> > > each
> > > > > > three
> > > > > > > > > months(1.5.1, 1.5.2, ...).
> > > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > >
> > > > > > > > *MembPhis*
> > > > > > > > My GitHub: https://github.com/membphis
> > > > > > > > Apache APISIX: https://github.com/apache/apisix
> > > > > > > >
> > > > > > >
> > > > > >
> > > > > --
> > > > > Thanks,
> > > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > > Twitter: _WenMing
> > > > >
> > > >
> > >
> >
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by JunXu Chen <ch...@apache.org>.
I think the LTS version should only be released when necessary, not
regularly.
On Sun, Oct 18, 2020 at 3:49 PM Sheng Wu <wu...@gmail.com> wrote:
> My 0.2 about the LTS version, usually LTS is about the feature stable
> version focusing on bugfix, which is rare to see for middleware or
> component. The platform prefers this.
> Mostly, people do compatible upgrades.
>
> Sheng Wu 吴晟
> Twitter, wusheng1108
>
>
> Ming Wen <we...@apache.org> 于2020年10月18日周日 下午3:36写道：
>
> > Apache APISIX releases a version every month, so I don’t think we have
> the
> > energy to maintain and release the LTS version
> >
> > Thanks,
> > Ming Wen, Apache APISIX & Apache SkyWalking
> > Twitter: _WenMing
> >
> >
> > vincixu <vi...@apache.org> 于2020年10月18日周日 上午9:39写道：
> >
> > > LTS branch is looks good for me.
> > > But I think we do not need "release branch", this will increase the
> > > maintenance cost of the repository and the possibility of release
> errors
> > > (because the operation becomes more complex), but in fact it does not
> > bring
> > > much more than the tag-based management model benefit
> > >
> > > Ming Wen <we...@apache.org> 于2020年10月15日周四 下午5:37写道：
> > >
> > > > We recommend users to use Apache release, then how to release the
> > version
> > > > of LTS branch?
> > > >
> > > > Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
> > > >
> > > > > > I don't think we need the release branch, because we already have
> > > > apache
> > > > > release packages and git tags.
> > > > >
> > > > > The `release` branch is not a branch called release, but the branch
> > > > starts
> > > > > from the release tag, like LuaJIT's branch v2.0:
> > > > > https://github.com/LuaJIT/LuaJIT/tree/v2.0
> > > > >
> > > > > > How long does LTS need to be maintained? One year or two years?
> > > > >
> > > > > I vote for two years.
> > > > >
> > > > > > And 1.5 is not a version suitable for long-term maintenance
> > > > >
> > > > > We can start to do it from 2.x when we have released 3.0
> > > > >
> > > > > > Apache APISIX does not have the role of maintainer
> > > > >
> > > > > The `maintainer` is not a position, it can be anyone who have the
> > time
> > > > (or
> > > > > who wrote the code caused the bug).
> > > > >
> > > > >
> > > > >
> > > > > Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> > > > >
> > > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > > I don't think we need the release branch, because we already have
> > > > apache
> > > > > > release packages and git tags.
> > > > > >
> > > > > > > 3. LTS branch (the highest minor number of release in the
> > previous
> > > > > major
> > > > > > release, like 1.5)
> > > > > > How long does LTS need to be maintained? One year or two years?
> And
> > > 1.5
> > > > > is
> > > > > > not a version suitable for long-term maintenance, etcd v2 will be
> > > > > obsolete
> > > > > > soon.
> > > > > >
> > > > > > > Bugfix will be manually ported to release branch by the
> > maintainer.
> > > > > > Apache APISIX does not have the role of maintainer.
> > > > > >
> > > > > > Thanks,
> > > > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > > > Twitter: _WenMing
> > > > > >
> > > > > >
> > > > > > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> > > > > >
> > > > > > > I think we can start to use this way after we release `2.0rc`.
> > > > > > >
> > > > > > > ^_^
> > > > > > >
> > > > > > >
> > > > > > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> > > > > > >
> > > > > > > > +1, it's very friendly to users.
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > 88786912@qq.com
> > > > > > > >
> > > > > > > > From: Zexuan Luo
> > > > > > > > Date: 2020-10-13 12:11
> > > > > > > > To: dev
> > > > > > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > > > > > Since we are going to release a new major version and
> nowadays
> > we
> > > > > have
> > > > > > > > plenty of users, I think it is time to bring out a serious
> > > multiple
> > > > > > > > branches maintain mechanism.
> > > > > > > >
> > > > > > > > The mechanism will contain three kinds of branches:
> > > > > > > > 1. master branch (the branch we submit all commits to)
> > > > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > > > > 3. LTS branch (the highest minor number of release in the
> > > previous
> > > > > > major
> > > > > > > > release, like 1.5)
> > > > > > > >
> > > > > > > > All PRs are still going to the master branch.
> > > > > > > >
> > > > > > > > Bugfix will be manually ported to release branch by the
> > > maintainer.
> > > > > > > > We will create a rc release on the release branch first, then
> > > > create
> > > > > a
> > > > > > > > formal release a month later.
> > > > > > > > Before the next minor release is created, we will create a
> > patch
> > > > > > release
> > > > > > > > each month(2.0.1, 2.0.2, ...).
> > > > > > > >
> > > > > > > > We will back port some important bugfix, for instance,
> security
> > > > > bugfix
> > > > > > > and
> > > > > > > > bugfix users required, to the LTS branch.
> > > > > > > > A new patch release will be created based on the LTS branch
> > each
> > > > > three
> > > > > > > > months(1.5.1, 1.5.2, ...).
> > > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > >
> > > > > > > *MembPhis*
> > > > > > > My GitHub: https://github.com/membphis
> > > > > > > Apache APISIX: https://github.com/apache/apisix
> > > > > > >
> > > > > >
> > > > >
> > > > --
> > > > Thanks,
> > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > Twitter: _WenMing
> > > >
> > >
> >
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Sheng Wu <wu...@gmail.com>.
My 0.2 about the LTS version, usually LTS is about the feature stable
version focusing on bugfix, which is rare to see for middleware or
component. The platform prefers this.
Mostly, people do compatible upgrades.
Sheng Wu 吴晟
Twitter, wusheng1108
Ming Wen <we...@apache.org> 于2020年10月18日周日 下午3:36写道：
> Apache APISIX releases a version every month, so I don’t think we have the
> energy to maintain and release the LTS version
>
> Thanks,
> Ming Wen, Apache APISIX & Apache SkyWalking
> Twitter: _WenMing
>
>
> vincixu <vi...@apache.org> 于2020年10月18日周日 上午9:39写道：
>
> > LTS branch is looks good for me.
> > But I think we do not need "release branch", this will increase the
> > maintenance cost of the repository and the possibility of release errors
> > (because the operation becomes more complex), but in fact it does not
> bring
> > much more than the tag-based management model benefit
> >
> > Ming Wen <we...@apache.org> 于2020年10月15日周四 下午5:37写道：
> >
> > > We recommend users to use Apache release, then how to release the
> version
> > > of LTS branch?
> > >
> > > Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
> > >
> > > > > I don't think we need the release branch, because we already have
> > > apache
> > > > release packages and git tags.
> > > >
> > > > The `release` branch is not a branch called release, but the branch
> > > starts
> > > > from the release tag, like LuaJIT's branch v2.0:
> > > > https://github.com/LuaJIT/LuaJIT/tree/v2.0
> > > >
> > > > > How long does LTS need to be maintained? One year or two years?
> > > >
> > > > I vote for two years.
> > > >
> > > > > And 1.5 is not a version suitable for long-term maintenance
> > > >
> > > > We can start to do it from 2.x when we have released 3.0
> > > >
> > > > > Apache APISIX does not have the role of maintainer
> > > >
> > > > The `maintainer` is not a position, it can be anyone who have the
> time
> > > (or
> > > > who wrote the code caused the bug).
> > > >
> > > >
> > > >
> > > > Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> > > >
> > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > I don't think we need the release branch, because we already have
> > > apache
> > > > > release packages and git tags.
> > > > >
> > > > > > 3. LTS branch (the highest minor number of release in the
> previous
> > > > major
> > > > > release, like 1.5)
> > > > > How long does LTS need to be maintained? One year or two years? And
> > 1.5
> > > > is
> > > > > not a version suitable for long-term maintenance, etcd v2 will be
> > > > obsolete
> > > > > soon.
> > > > >
> > > > > > Bugfix will be manually ported to release branch by the
> maintainer.
> > > > > Apache APISIX does not have the role of maintainer.
> > > > >
> > > > > Thanks,
> > > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > > Twitter: _WenMing
> > > > >
> > > > >
> > > > > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> > > > >
> > > > > > I think we can start to use this way after we release `2.0rc`.
> > > > > >
> > > > > > ^_^
> > > > > >
> > > > > >
> > > > > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> > > > > >
> > > > > > > +1, it's very friendly to users.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > 88786912@qq.com
> > > > > > >
> > > > > > > From: Zexuan Luo
> > > > > > > Date: 2020-10-13 12:11
> > > > > > > To: dev
> > > > > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > > > > Since we are going to release a new major version and nowadays
> we
> > > > have
> > > > > > > plenty of users, I think it is time to bring out a serious
> > multiple
> > > > > > > branches maintain mechanism.
> > > > > > >
> > > > > > > The mechanism will contain three kinds of branches:
> > > > > > > 1. master branch (the branch we submit all commits to)
> > > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > > > 3. LTS branch (the highest minor number of release in the
> > previous
> > > > > major
> > > > > > > release, like 1.5)
> > > > > > >
> > > > > > > All PRs are still going to the master branch.
> > > > > > >
> > > > > > > Bugfix will be manually ported to release branch by the
> > maintainer.
> > > > > > > We will create a rc release on the release branch first, then
> > > create
> > > > a
> > > > > > > formal release a month later.
> > > > > > > Before the next minor release is created, we will create a
> patch
> > > > > release
> > > > > > > each month(2.0.1, 2.0.2, ...).
> > > > > > >
> > > > > > > We will back port some important bugfix, for instance, security
> > > > bugfix
> > > > > > and
> > > > > > > bugfix users required, to the LTS branch.
> > > > > > > A new patch release will be created based on the LTS branch
> each
> > > > three
> > > > > > > months(1.5.1, 1.5.2, ...).
> > > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > >
> > > > > > *MembPhis*
> > > > > > My GitHub: https://github.com/membphis
> > > > > > Apache APISIX: https://github.com/apache/apisix
> > > > > >
> > > > >
> > > >
> > > --
> > > Thanks,
> > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > Twitter: _WenMing
> > >
> >
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Ming Wen <we...@apache.org>.
Apache APISIX releases a version every month, so I don’t think we have the
energy to maintain and release the LTS version
Thanks,
Ming Wen, Apache APISIX & Apache SkyWalking
Twitter: _WenMing
vincixu <vi...@apache.org> 于2020年10月18日周日 上午9:39写道：
> LTS branch is looks good for me.
> But I think we do not need "release branch", this will increase the
> maintenance cost of the repository and the possibility of release errors
> (because the operation becomes more complex), but in fact it does not bring
> much more than the tag-based management model benefit
>
> Ming Wen <we...@apache.org> 于2020年10月15日周四 下午5:37写道：
>
> > We recommend users to use Apache release, then how to release the version
> > of LTS branch?
> >
> > Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
> >
> > > > I don't think we need the release branch, because we already have
> > apache
> > > release packages and git tags.
> > >
> > > The `release` branch is not a branch called release, but the branch
> > starts
> > > from the release tag, like LuaJIT's branch v2.0:
> > > https://github.com/LuaJIT/LuaJIT/tree/v2.0
> > >
> > > > How long does LTS need to be maintained? One year or two years?
> > >
> > > I vote for two years.
> > >
> > > > And 1.5 is not a version suitable for long-term maintenance
> > >
> > > We can start to do it from 2.x when we have released 3.0
> > >
> > > > Apache APISIX does not have the role of maintainer
> > >
> > > The `maintainer` is not a position, it can be anyone who have the time
> > (or
> > > who wrote the code caused the bug).
> > >
> > >
> > >
> > > Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> > >
> > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > I don't think we need the release branch, because we already have
> > apache
> > > > release packages and git tags.
> > > >
> > > > > 3. LTS branch (the highest minor number of release in the previous
> > > major
> > > > release, like 1.5)
> > > > How long does LTS need to be maintained? One year or two years? And
> 1.5
> > > is
> > > > not a version suitable for long-term maintenance, etcd v2 will be
> > > obsolete
> > > > soon.
> > > >
> > > > > Bugfix will be manually ported to release branch by the maintainer.
> > > > Apache APISIX does not have the role of maintainer.
> > > >
> > > > Thanks,
> > > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > > Twitter: _WenMing
> > > >
> > > >
> > > > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> > > >
> > > > > I think we can start to use this way after we release `2.0rc`.
> > > > >
> > > > > ^_^
> > > > >
> > > > >
> > > > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> > > > >
> > > > > > +1, it's very friendly to users.
> > > > > >
> > > > > >
> > > > > >
> > > > > > 88786912@qq.com
> > > > > >
> > > > > > From: Zexuan Luo
> > > > > > Date: 2020-10-13 12:11
> > > > > > To: dev
> > > > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > > > Since we are going to release a new major version and nowadays we
> > > have
> > > > > > plenty of users, I think it is time to bring out a serious
> multiple
> > > > > > branches maintain mechanism.
> > > > > >
> > > > > > The mechanism will contain three kinds of branches:
> > > > > > 1. master branch (the branch we submit all commits to)
> > > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > > 3. LTS branch (the highest minor number of release in the
> previous
> > > > major
> > > > > > release, like 1.5)
> > > > > >
> > > > > > All PRs are still going to the master branch.
> > > > > >
> > > > > > Bugfix will be manually ported to release branch by the
> maintainer.
> > > > > > We will create a rc release on the release branch first, then
> > create
> > > a
> > > > > > formal release a month later.
> > > > > > Before the next minor release is created, we will create a patch
> > > > release
> > > > > > each month(2.0.1, 2.0.2, ...).
> > > > > >
> > > > > > We will back port some important bugfix, for instance, security
> > > bugfix
> > > > > and
> > > > > > bugfix users required, to the LTS branch.
> > > > > > A new patch release will be created based on the LTS branch each
> > > three
> > > > > > months(1.5.1, 1.5.2, ...).
> > > > > >
> > > > >
> > > > >
> > > > > --
> > > > >
> > > > > *MembPhis*
> > > > > My GitHub: https://github.com/membphis
> > > > > Apache APISIX: https://github.com/apache/apisix
> > > > >
> > > >
> > >
> > --
> > Thanks,
> > Ming Wen, Apache APISIX & Apache SkyWalking
> > Twitter: _WenMing
> >
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by vincixu <vi...@apache.org>.
LTS branch is looks good for me.
But I think we do not need "release branch", this will increase the
maintenance cost of the repository and the possibility of release errors
(because the operation becomes more complex), but in fact it does not bring
much more than the tag-based management model benefit
Ming Wen <we...@apache.org> 于2020年10月15日周四 下午5:37写道：
> We recommend users to use Apache release, then how to release the version
> of LTS branch?
>
> Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
>
> > > I don't think we need the release branch, because we already have
> apache
> > release packages and git tags.
> >
> > The `release` branch is not a branch called release, but the branch
> starts
> > from the release tag, like LuaJIT's branch v2.0:
> > https://github.com/LuaJIT/LuaJIT/tree/v2.0
> >
> > > How long does LTS need to be maintained? One year or two years?
> >
> > I vote for two years.
> >
> > > And 1.5 is not a version suitable for long-term maintenance
> >
> > We can start to do it from 2.x when we have released 3.0
> >
> > > Apache APISIX does not have the role of maintainer
> >
> > The `maintainer` is not a position, it can be anyone who have the time
> (or
> > who wrote the code caused the bug).
> >
> >
> >
> > Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> >
> > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > I don't think we need the release branch, because we already have
> apache
> > > release packages and git tags.
> > >
> > > > 3. LTS branch (the highest minor number of release in the previous
> > major
> > > release, like 1.5)
> > > How long does LTS need to be maintained? One year or two years? And 1.5
> > is
> > > not a version suitable for long-term maintenance, etcd v2 will be
> > obsolete
> > > soon.
> > >
> > > > Bugfix will be manually ported to release branch by the maintainer.
> > > Apache APISIX does not have the role of maintainer.
> > >
> > > Thanks,
> > > Ming Wen, Apache APISIX & Apache SkyWalking
> > > Twitter: _WenMing
> > >
> > >
> > > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> > >
> > > > I think we can start to use this way after we release `2.0rc`.
> > > >
> > > > ^_^
> > > >
> > > >
> > > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> > > >
> > > > > +1, it's very friendly to users.
> > > > >
> > > > >
> > > > >
> > > > > 88786912@qq.com
> > > > >
> > > > > From: Zexuan Luo
> > > > > Date: 2020-10-13 12:11
> > > > > To: dev
> > > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > > Since we are going to release a new major version and nowadays we
> > have
> > > > > plenty of users, I think it is time to bring out a serious multiple
> > > > > branches maintain mechanism.
> > > > >
> > > > > The mechanism will contain three kinds of branches:
> > > > > 1. master branch (the branch we submit all commits to)
> > > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > > 3. LTS branch (the highest minor number of release in the previous
> > > major
> > > > > release, like 1.5)
> > > > >
> > > > > All PRs are still going to the master branch.
> > > > >
> > > > > Bugfix will be manually ported to release branch by the maintainer.
> > > > > We will create a rc release on the release branch first, then
> create
> > a
> > > > > formal release a month later.
> > > > > Before the next minor release is created, we will create a patch
> > > release
> > > > > each month(2.0.1, 2.0.2, ...).
> > > > >
> > > > > We will back port some important bugfix, for instance, security
> > bugfix
> > > > and
> > > > > bugfix users required, to the LTS branch.
> > > > > A new patch release will be created based on the LTS branch each
> > three
> > > > > months(1.5.1, 1.5.2, ...).
> > > > >
> > > >
> > > >
> > > > --
> > > >
> > > > *MembPhis*
> > > > My GitHub: https://github.com/membphis
> > > > Apache APISIX: https://github.com/apache/apisix
> > > >
> > >
> >
> --
> Thanks,
> Ming Wen, Apache APISIX & Apache SkyWalking
> Twitter: _WenMing
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Ming Wen <we...@apache.org>.
We recommend users to use Apache release, then how to release the version
of LTS branch?
Zexuan Luo <sp...@apache.org>于2020年10月15日 周四下午5:33写道：
> > I don't think we need the release branch, because we already have apache
> release packages and git tags.
>
> The `release` branch is not a branch called release, but the branch starts
> from the release tag, like LuaJIT's branch v2.0:
> https://github.com/LuaJIT/LuaJIT/tree/v2.0
>
> > How long does LTS need to be maintained? One year or two years?
>
> I vote for two years.
>
> > And 1.5 is not a version suitable for long-term maintenance
>
> We can start to do it from 2.x when we have released 3.0
>
> > Apache APISIX does not have the role of maintainer
>
> The `maintainer` is not a position, it can be anyone who have the time (or
> who wrote the code caused the bug).
>
>
>
> Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
>
> > > 2. release branch (the latest release, like the ongoing 2.0)
> > I don't think we need the release branch, because we already have apache
> > release packages and git tags.
> >
> > > 3. LTS branch (the highest minor number of release in the previous
> major
> > release, like 1.5)
> > How long does LTS need to be maintained? One year or two years? And 1.5
> is
> > not a version suitable for long-term maintenance, etcd v2 will be
> obsolete
> > soon.
> >
> > > Bugfix will be manually ported to release branch by the maintainer.
> > Apache APISIX does not have the role of maintainer.
> >
> > Thanks,
> > Ming Wen, Apache APISIX & Apache SkyWalking
> > Twitter: _WenMing
> >
> >
> > YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> >
> > > I think we can start to use this way after we release `2.0rc`.
> > >
> > > ^_^
> > >
> > >
> > > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> > >
> > > > +1, it's very friendly to users.
> > > >
> > > >
> > > >
> > > > 88786912@qq.com
> > > >
> > > > From: Zexuan Luo
> > > > Date: 2020-10-13 12:11
> > > > To: dev
> > > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > > Since we are going to release a new major version and nowadays we
> have
> > > > plenty of users, I think it is time to bring out a serious multiple
> > > > branches maintain mechanism.
> > > >
> > > > The mechanism will contain three kinds of branches:
> > > > 1. master branch (the branch we submit all commits to)
> > > > 2. release branch (the latest release, like the ongoing 2.0)
> > > > 3. LTS branch (the highest minor number of release in the previous
> > major
> > > > release, like 1.5)
> > > >
> > > > All PRs are still going to the master branch.
> > > >
> > > > Bugfix will be manually ported to release branch by the maintainer.
> > > > We will create a rc release on the release branch first, then create
> a
> > > > formal release a month later.
> > > > Before the next minor release is created, we will create a patch
> > release
> > > > each month(2.0.1, 2.0.2, ...).
> > > >
> > > > We will back port some important bugfix, for instance, security
> bugfix
> > > and
> > > > bugfix users required, to the LTS branch.
> > > > A new patch release will be created based on the LTS branch each
> three
> > > > months(1.5.1, 1.5.2, ...).
> > > >
> > >
> > >
> > > --
> > >
> > > *MembPhis*
> > > My GitHub: https://github.com/membphis
> > > Apache APISIX: https://github.com/apache/apisix
> > >
> >
>
--
Thanks,
Ming Wen, Apache APISIX & Apache SkyWalking
Twitter: _WenMing
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Zexuan Luo <sp...@apache.org>.
> I don't think we need the release branch, because we already have apache
release packages and git tags.
The `release` branch is not a branch called release, but the branch starts
from the release tag, like LuaJIT's branch v2.0:
https://github.com/LuaJIT/LuaJIT/tree/v2.0
> How long does LTS need to be maintained? One year or two years?
I vote for two years.
> And 1.5 is not a version suitable for long-term maintenance
We can start to do it from 2.x when we have released 3.0
> Apache APISIX does not have the role of maintainer
The `maintainer` is not a position, it can be anyone who have the time (or
who wrote the code caused the bug).
Ming Wen <we...@apache.org> 于2020年10月13日周二 下午11:54写道：
> > 2. release branch (the latest release, like the ongoing 2.0)
> I don't think we need the release branch, because we already have apache
> release packages and git tags.
>
> > 3. LTS branch (the highest minor number of release in the previous major
> release, like 1.5)
> How long does LTS need to be maintained? One year or two years? And 1.5 is
> not a version suitable for long-term maintenance, etcd v2 will be obsolete
> soon.
>
> > Bugfix will be manually ported to release branch by the maintainer.
> Apache APISIX does not have the role of maintainer.
>
> Thanks,
> Ming Wen, Apache APISIX & Apache SkyWalking
> Twitter: _WenMing
>
>
> YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
>
> > I think we can start to use this way after we release `2.0rc`.
> >
> > ^_^
> >
> >
> > On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> >
> > > +1, it's very friendly to users.
> > >
> > >
> > >
> > > 88786912@qq.com
> > >
> > > From: Zexuan Luo
> > > Date: 2020-10-13 12:11
> > > To: dev
> > > Subject: [DISCUSS] Maintain multiple branches of apisix
> > > Since we are going to release a new major version and nowadays we have
> > > plenty of users, I think it is time to bring out a serious multiple
> > > branches maintain mechanism.
> > >
> > > The mechanism will contain three kinds of branches:
> > > 1. master branch (the branch we submit all commits to)
> > > 2. release branch (the latest release, like the ongoing 2.0)
> > > 3. LTS branch (the highest minor number of release in the previous
> major
> > > release, like 1.5)
> > >
> > > All PRs are still going to the master branch.
> > >
> > > Bugfix will be manually ported to release branch by the maintainer.
> > > We will create a rc release on the release branch first, then create a
> > > formal release a month later.
> > > Before the next minor release is created, we will create a patch
> release
> > > each month(2.0.1, 2.0.2, ...).
> > >
> > > We will back port some important bugfix, for instance, security bugfix
> > and
> > > bugfix users required, to the LTS branch.
> > > A new patch release will be created based on the LTS branch each three
> > > months(1.5.1, 1.5.2, ...).
> > >
> >
> >
> > --
> >
> > *MembPhis*
> > My GitHub: https://github.com/membphis
> > Apache APISIX: https://github.com/apache/apisix
> >
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by Ming Wen <we...@apache.org>.
> 2. release branch (the latest release, like the ongoing 2.0)
I don't think we need the release branch, because we already have apache
release packages and git tags.
> 3. LTS branch (the highest minor number of release in the previous major
release, like 1.5)
How long does LTS need to be maintained? One year or two years? And 1.5 is
not a version suitable for long-term maintenance, etcd v2 will be obsolete
soon.
> Bugfix will be manually ported to release branch by the maintainer.
Apache APISIX does not have the role of maintainer.
Thanks,
Ming Wen, Apache APISIX & Apache SkyWalking
Twitter: _WenMing
YuanSheng Wang <me...@apache.org> 于2020年10月13日周二 下午9:59写道：
> I think we can start to use this way after we release `2.0rc`.
>
> ^_^
>
>
> On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
>
> > +1, it's very friendly to users.
> >
> >
> >
> > 88786912@qq.com
> >
> > From: Zexuan Luo
> > Date: 2020-10-13 12:11
> > To: dev
> > Subject: [DISCUSS] Maintain multiple branches of apisix
> > Since we are going to release a new major version and nowadays we have
> > plenty of users, I think it is time to bring out a serious multiple
> > branches maintain mechanism.
> >
> > The mechanism will contain three kinds of branches:
> > 1. master branch (the branch we submit all commits to)
> > 2. release branch (the latest release, like the ongoing 2.0)
> > 3. LTS branch (the highest minor number of release in the previous major
> > release, like 1.5)
> >
> > All PRs are still going to the master branch.
> >
> > Bugfix will be manually ported to release branch by the maintainer.
> > We will create a rc release on the release branch first, then create a
> > formal release a month later.
> > Before the next minor release is created, we will create a patch release
> > each month(2.0.1, 2.0.2, ...).
> >
> > We will back port some important bugfix, for instance, security bugfix
> and
> > bugfix users required, to the LTS branch.
> > A new patch release will be created based on the LTS branch each three
> > months(1.5.1, 1.5.2, ...).
> >
>
>
> --
>
> *MembPhis*
> My GitHub: https://github.com/membphis
> Apache APISIX: https://github.com/apache/apisix
>
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by YuanSheng Wang <me...@apache.org>.
I think we can start to use this way after we release `2.0rc`.
^_^
On Tue, Oct 13, 2020 at 9:14 PM dabue <88...@qq.com> wrote:
> +1, it's very friendly to users.
>
>
>
> 88786912@qq.com
>
> From: Zexuan Luo
> Date: 2020-10-13 12:11
> To: dev
> Subject: [DISCUSS] Maintain multiple branches of apisix
> Since we are going to release a new major version and nowadays we have
> plenty of users, I think it is time to bring out a serious multiple
> branches maintain mechanism.
>
> The mechanism will contain three kinds of branches:
> 1. master branch (the branch we submit all commits to)
> 2. release branch (the latest release, like the ongoing 2.0)
> 3. LTS branch (the highest minor number of release in the previous major
> release, like 1.5)
>
> All PRs are still going to the master branch.
>
> Bugfix will be manually ported to release branch by the maintainer.
> We will create a rc release on the release branch first, then create a
> formal release a month later.
> Before the next minor release is created, we will create a patch release
> each month(2.0.1, 2.0.2, ...).
>
> We will back port some important bugfix, for instance, security bugfix and
> bugfix users required, to the LTS branch.
> A new patch release will be created based on the LTS branch each three
> months(1.5.1, 1.5.2, ...).
>
--
*MembPhis*
My GitHub: https://github.com/membphis
Apache APISIX: https://github.com/apache/apisix
Re: [DISCUSS] Maintain multiple branches of apisix
Posted by dabue <88...@qq.com>.
+1, it's very friendly to users.
88786912@qq.com
From: Zexuan Luo
Date: 2020-10-13 12:11
To: dev
Subject: [DISCUSS] Maintain multiple branches of apisix
Since we are going to release a new major version and nowadays we have
plenty of users, I think it is time to bring out a serious multiple
branches maintain mechanism.
The mechanism will contain three kinds of branches:
1. master branch (the branch we submit all commits to)
2. release branch (the latest release, like the ongoing 2.0)
3. LTS branch (the highest minor number of release in the previous major
release, like 1.5)
All PRs are still going to the master branch.
Bugfix will be manually ported to release branch by the maintainer.
We will create a rc release on the release branch first, then create a
formal release a month later.
Before the next minor release is created, we will create a patch release
each month(2.0.1, 2.0.2, ...).
We will back port some important bugfix, for instance, security bugfix and
bugfix users required, to the LTS branch.
A new patch release will be created based on the LTS branch each three
months(1.5.1, 1.5.2, ...).