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 [email protected] > On Oct 13, 2020, at 11:53 PM, Ming Wen <[email protected]> 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 <[email protected]> 于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 <[email protected]> wrote: >> >>> +1, it's very friendly to users. >>> >>> >>> >>> [email protected] >>> >>> 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 >>
