And for CI, it would only make use of the branch when releasing. After the new version got released, the branch got no use and thus we could remove it.
Wo Soyoung <[email protected]> 于2021年2月25日周四 下午12:06写道： > If it's useless, is there any reason do we need to keep them. > I just find that git checkout `2.3` and `v2.3` would give us a different > result is weird to me. > > Zexuan Luo <[email protected]> 于2021年2月25日周四 上午10:12写道： > >> The branch doesn't have any special meaning as we don't maintain LTS >> version. >> Only after you add a CI for it days ago, the branch starts to have some >> meaning. >> >> There is no need to fix it as it's not a problem. >> >> Shuyang Wu <[email protected]> 于2021年2月25日周四 上午10:08写道： >> > >> > Hi Zhiyuan, >> > >> > Yes it's not so urgent. But I think we need to fix it sooner or later. >> > Maybe it's a good idea to fix it before the next release. >> > >> > Best, >> > Shuyang >> > >> > Zhiyuan Ju <[email protected]> 于2021年2月25日周四 上午5:34写道： >> > >> > > Hi, >> > > >> > > Yes, there have some version branches surpass tags indeed, I have one >> > > concern: if there has a very urgent issue in versioned branch, should >> we >> > > retag or renew a tag? >> > > >> > > Shuyang Wu <[email protected]>于2021年2月25日 周四上午12:24写道： >> > > >> > > > *Problem* >> > > > >> > > > Currently in APISIX, for one certain version, branches would >> surpass tags >> > > > for several commits, even if we did not cherry-pick any new bugfix, >> say >> > > > >> > > > > https://github.com/apache/apisix/tree/v1.5 surpass >> > > > https://github.com/apache/apisix/tree/1.5 for a dozen commits. >> > > > > https://github.com/apache/apisix/tree/v2.1 surpass >> > > > https://github.com/apache/apisix/tree/2.1 for three commits. >> > > > > https://github.com/apache/apisix/tree/v2.3 surpass >> > > > https://github.com/apache/apisix/tree/2.3 for six commits. >> > > > >> > > > which could mislead users when they try to get the history version >> when >> > > > building from source. >> > > > >> > > > Also, it seems not necessary to keep both branches and tags for the >> same >> > > > purpose. Since we're not maintaining history versions, we could >> only keep >> > > > tags for different versions, and remove all the release branches >> (since >> > > > they are all stale) except the newest ones. >> > > > >> > > > *Suggestion* >> > > > >> > > > For now: >> > > > - Retag all tags which are not synced with branches >> > > > - Remove all branches except v1.5 and v2.3, and rename them to >> > > release/x.y >> > > > (to make names of branches and tags not similar, to avoid >> mistyping). >> > > > - Rename tags to the same pattern (now they have x.y and vx.y) >> > > > >> > > > For future: >> > > > - Tags must be made after the release PR got merged (currently it >> seems >> > > tag >> > > > would be made when creating release PR, so it would missed those >> commits >> > > > which are merged during PR development) >> > > > >> > > -- >> > > 来自 琚致远 >> > > >> >
