From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"rfc@edk2.groups.io" <rfc@edk2.groups.io>,
"gaoliming@byosoft.com.cn" <gaoliming@byosoft.com.cn>,
"Kinney, Michael D" <michael.d.kinney@intel.com>,
"Andrew Fish (afish@apple.com)" <afish@apple.com>,
Leif Lindholm <leif@nuviainc.com>,
"Laszlo Ersek <lersek@redhat.com> (lersek@redhat.com)"
<lersek@redhat.com>, 'Sean Brogan' <sean.brogan@microsoft.com>,
'Bret Barkelew' <Bret.Barkelew@microsoft.com>
Subject: [RFC] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111)
Date: Tue, 15 Dec 2020 16:53:09 +0000 [thread overview]
Message-ID: <BL0PR11MB3236A97D046A4280AAA19AF6D2C60@BL0PR11MB3236.namprd11.prod.outlook.com> (raw)
Hello,
The following bug has been fixed on edk2/master
https://bugzilla.tianocore.org/show_bug.cgi?id=3111
https://github.com/tianocore/edk2/pull/1226
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.
https://github.com/tianocore/edk2/pull/1226/commits/893cfe2847b83da74f53858d6acaa15a348bad7c
https://github.com/tianocore/edk2/pull/1226/commits/16491ba6a6e9a91cedeeed45bc0fbdfde49f7968
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.
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:
1) Supported branch naming convention.
Proposal: stable/edk2-stable*
Example: stable/edk2-stable202011
2) CI requirements for supported branches.
Proposal: Update .azurepipelines yml files to also trigger on stable/* branches
and update GitHub settings so stable/* branches are protected branches.
3) Release requirements for supported branches.
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.
Proposal: edk2-stable<YYYY><MM>.<XX>
Example : edk2-stable201111.01
Please let me know if you have any feedback or comments on this proposal. The goal
is to close on this topic this week.
Thank you,
Mike
next reply other threads:[~2020-12-15 16:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 16:53 Michael D Kinney [this message]
2020-12-15 17:16 ` [RFC] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111) Leif Lindholm
2020-12-15 18:56 ` [edk2-rfc] " Michael D Kinney
2020-12-15 19:06 ` Bret Barkelew
2020-12-15 19:39 ` Leif Lindholm
2020-12-15 20:42 ` Michael D Kinney
2020-12-17 13:33 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BL0PR11MB3236A97D046A4280AAA19AF6D2C60@BL0PR11MB3236.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox