* [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111)
@ 2020-12-19 2:02 Michael D Kinney
2020-12-21 1:08 ` 回复: [edk2-rfc] " gaoliming
0 siblings, 1 reply; 2+ messages in thread
From: Michael D Kinney @ 2020-12-19 2:02 UTC (permalink / raw)
To: rfc@edk2.groups.io, devel@edk2.groups.io, Kinney, Michael D
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* 回复: [edk2-rfc] [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111)
2020-12-19 2:02 [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111) Michael D Kinney
@ 2020-12-21 1:08 ` gaoliming
0 siblings, 0 replies; 2+ messages in thread
From: gaoliming @ 2020-12-21 1:08 UTC (permalink / raw)
To: rfc, michael.d.kinney, devel
Mike:
It is OK to me. I have no other comments.
Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+34240+470+4905953+8776774@groups.io
> <bounce+34240+470+4905953+8776774@groups.io> 代表 Michael D
> Kinney
> 发送时间: 2020年12月19日 10:03
> 收件人: rfc@edk2.groups.io; devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> 主题: [edk2-rfc] [RFC V3] Create supported branch from edk2-stable* tag
> (Required to address critical bug BZ3111)
>
> 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/893cfe2847b83da74f
> 53858d6acaa15a348bad7c
>
>
> https://github.com/tianocore/edk2/pull/1226/commits/16491ba6a6e9a91ce
> deeed45bc0fbdfde49f7968
>
>
>
> 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
>
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-21 1:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-19 2:02 [RFC V3] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111) Michael D Kinney
2020-12-21 1:08 ` 回复: [edk2-rfc] " gaoliming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox