From e3ac384d78168f6695cb006ea65b34989844e83b Mon Sep 17 00:00:00 2001 From: Bethany Nicolle Griggs Date: Wed, 8 Dec 2021 16:08:57 +0000 Subject: [PATCH] doc: simplify major release preparation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: https://github.com/nodejs/node/pull/40816 Reviewed-By: Rich Trott Reviewed-By: Matteo Collina Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: Antoine du Hamel Reviewed-By: Danielle Adams Reviewed-By: Robert Nagy Reviewed-By: Michael Dawson Reviewed-By: Tobias Nießen --- doc/guides/releases.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/guides/releases.md b/doc/guides/releases.md index afcdf59f8dcc13..beb49771beb46e 100644 --- a/doc/guides/releases.md +++ b/doc/guides/releases.md @@ -782,18 +782,16 @@ announced immediately following the release of 12.0.0). ### Release branch -Approximately three months before a major release, new `vN.x` and +Approximately two months before a major release, new `vN.x` and `vN.x-staging` branches (where `N` indicates the major release) should be -created as forks of the `master` branch. Up until one month before the release -date, these must be kept in sync with `master` and must not be considered to -be stable branches (e.g. they may be force pushed). +created as forks of the `master` branch. Up until one week before the release +date, these must be kept in sync with `master`. The `vN.x` and `vN.x-staging` branches must be kept in sync with one another -up until the date of release. +up until the date of the release. -One month or less before the release date, commits must be cherry-picked into -the two branches. To land `SEMVER-MAJOR` at this time requires no objections -from the TSC. +The TSC should be informed of any `SEMVER-MAJOR` commits that land within one +month of the release. ### Create release labels @@ -812,7 +810,7 @@ labels of previous releases. ### Release proposal -A draft release proposal should be created two months before the release. A +A draft release proposal should be created 6 weeks before the release. A separate `vN.x-proposal` branch should be created that tracks the `vN.x` branch. This branch will contain the draft release commit (with the draft changelog).