Skip to content

Commit

Permalink
doc: simplify major release preparation
Browse files Browse the repository at this point in the history
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 <rtrott@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
BethGriggs authored and danielleadams committed Dec 13, 2021
1 parent a77cae1 commit e3ac384
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions doc/guides/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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).
Expand Down

0 comments on commit e3ac384

Please sign in to comment.