From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web11.740.1608081546795638415 for ; Tue, 15 Dec 2020 17:19:08 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 16 Dec 2020 09:18:58 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Kinney, Michael D'" , , , "'Andrew Fish'" , "'Leif Lindholm'" , , "'Sean Brogan'" , "'Bret Barkelew'" References: In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbUkZDIFYyXSBDcmVhdGUgc3VwcG9ydGVkIGJyYW5jaCBmcm9tIGVkazItc3RhYmxlKiB0YWcgKFJlcXVpcmVkIHRvIGFkZHJlc3MgY3JpdGljYWwgYnVnIEJaMzExMSk=?= Date: Wed, 16 Dec 2020 09:18:59 +0800 Message-ID: <005201d6d349$6f72b4b0$4e581e10$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQKH7p2ep/ntkJpdYGL/0IuxskQGzqiWrq1w Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Mike: > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: Kinney, Michael D = > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: = 2020=E5=B9=B412=E6=9C=8816=E6=97=A5 8:25 > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; rfc@edk2.groups.io; > gaoliming@byosoft.com.cn; Andrew Fish (afish@apple.com) > ; Leif Lindholm ; Laszlo Ersek > (lersek@redhat.com) ; 'Sean > Brogan' ; 'Bret Barkelew' > ; Kinney, Michael D > > =E4=B8=BB=E9=A2=98: [RFC V2] Create supported branch from edk2-stable* = tag (Required to > address critical bug BZ3111) >=20 > Hello, >=20 > The following bug has been fixed on edk2/master >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D3111 > https://github.com/tianocore/edk2/pull/1226 >=20 > This bug is also considered a critical bug against edk2-stable202011. = The > behavior > of the Variable Lock Protocol was changed in a non-backwards = compatible > manner in > edk2-stable202011 and this is impacting some downstream platforms. = The > following > 2 commits on edk2/master restore the original behavior of the Variable = Lock > Protocol. >=20 >=20 > https://github.com/tianocore/edk2/pull/1226/commits/893cfe2847b83da74f > 53858d6acaa15a348bad7c >=20 > https://github.com/tianocore/edk2/pull/1226/commits/16491ba6a6e9a91ce > deeed45bc0fbdfde49f7968 >=20 [Liming] This one is for unit test. It is not critical fix. I don't = think it is required. > The request here is to create a supported branch from = edk2-stable202011 tag > and apply > these 2 commits as critical bug fixes on the supported branch. >=20 > Since we started using the edk2-stable* tag process, there has not = been a > request to create > a supported branch from one of those tags. As a result, there are a = couple > opens that > need to be addressed: >=20 > 1) Supported branch naming convention. >=20 > Proposal: stable/ > Example: stable/202011 Here is my suggestion on the live period of the stable tag branch.=20 The stable tag branch will be created only when the critical issue is = found in this stable tag. By default, no stable tag branch is created.=20 Now, the quarterly stable tag will be created every three months. So, = this branch will exist for at most three months.=20 Once next stable tag is created, new stable tag will be used. Previous = stable tag branch will not be maintained.=20 That means only latest stable tag branch will be maintained if it is = created.=20 >=20 > 2) CI requirements for supported branches. >=20 > Proposal: Update .azurepipelines yml files to also trigger on = stable/* > branches > and update GitHub settings so stable/* branches are protected > branches. >=20 The patch has been verified in master. CI test may not be necessary.=20 > 3) Release requirements for supported branches. >=20 > Proposal: If there are a significant number of critical fixes = applied to > a stable/edk2-stable* branch, then a request for a release can be = made > that > would trigger focused testing of the supported branch and creation = of a > new > release. If all testing passes, then a tag is created on the > stable/edk2-stable* > branch and a release is created on GitHub that summarizes the set = of > critical > fixes and the testing performed. >=20 > Proposal: edk2-stable. > Example : edk2-stable201111.01 >=20 It is OK to create new stable tag per the request. The platform can use = stable branch. Besides, there are few new issues. I have cancelled the bug triage = meeting.=20 Thanks Liming > Please let me know if you have any feedback or comments on this = proposal. > The goal > is to close on this topic this week. >=20 > Thank you, >=20 > Mike