Skip to content

Commit e3ac384

Browse files
BethGriggsdanielleadams
authored andcommitted
doc: simplify major release preparation
Changes/rational: - Change the branch creation to two months prior from three months prior to the release. - Do not cherry-pick commits within the last month - mirror the master branch up until 1 week before the release. - Dropped 'semver major cut-off' and replace with 'Inform TSC of any majors which land within a month of the release'. PR-URL: #40816 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
1 parent a77cae1 commit e3ac384

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

doc/guides/releases.md

+7-9
Original file line numberDiff line numberDiff line change
@@ -782,18 +782,16 @@ announced immediately following the release of 12.0.0).
782782

783783
### Release branch
784784

785-
Approximately three months before a major release, new `vN.x` and
785+
Approximately two months before a major release, new `vN.x` and
786786
`vN.x-staging` branches (where `N` indicates the major release) should be
787-
created as forks of the `master` branch. Up until one month before the release
788-
date, these must be kept in sync with `master` and must not be considered to
789-
be stable branches (e.g. they may be force pushed).
787+
created as forks of the `master` branch. Up until one week before the release
788+
date, these must be kept in sync with `master`.
790789

791790
The `vN.x` and `vN.x-staging` branches must be kept in sync with one another
792-
up until the date of release.
791+
up until the date of the release.
793792

794-
One month or less before the release date, commits must be cherry-picked into
795-
the two branches. To land `SEMVER-MAJOR` at this time requires no objections
796-
from the TSC.
793+
The TSC should be informed of any `SEMVER-MAJOR` commits that land within one
794+
month of the release.
797795

798796
### Create release labels
799797

@@ -812,7 +810,7 @@ labels of previous releases.
812810

813811
### Release proposal
814812

815-
A draft release proposal should be created two months before the release. A
813+
A draft release proposal should be created 6 weeks before the release. A
816814
separate `vN.x-proposal` branch should be created that tracks the `vN.x`
817815
branch. This branch will contain the draft release commit (with the draft
818816
changelog).

0 commit comments

Comments
 (0)