From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: "rfc@edk2.groups.io" <rfc@edk2.groups.io>,
"devel@edk2.groups.io" <devel@edk2.groups.io>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111)
Date: Sat, 19 Dec 2020 02:02:48 +0000 [thread overview]
Message-ID: <BL0PR11MB323658BAFBE5A6522E630470D2C20@BL0PR11MB3236.namprd11.prod.outlook.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2368 bytes --]
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.
Branch Proposal: stable/<YYYY><MM>
Branch Example: stable/202011
2) CI requirements for supported branches.
Proposal: Update .azurepipelines yml files to trigger on stable/* branches,
update .mergify configuration file to support merging of stable/* branches,
and update GitHub branch protection settings to protect stable/* branches.
3) A stable/* branch is only supported until the next edk2-stable tag release.
4) Release requirements for supported branches.
Proposal: If there are a significant number of critical fixes applied to
a 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/*
branch and a release is created on GitHub that summarizes the set of
critical fixes and the testing performed.
Tag Proposal: edk2-stable<YYYY><MM>.<XX>
Tag Example : edk2-stable202011.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
[-- Attachment #2: Type: text/html, Size: 44211 bytes --]
next reply other threads:[~2020-12-19 2:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 2:02 Michael D Kinney [this message]
2020-12-21 1:08 ` 回复: [edk2-rfc] [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111) gaoliming
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=BL0PR11MB323658BAFBE5A6522E630470D2C20@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