From 03d080689a0f2c7f9d4f8791318aea276505b2ab Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 23 Aug 2022 23:35:18 +0200 Subject: [PATCH] Changes reflecting the new placeholder policy for stabilizations --- src/release/backporting.md | 1 + src/release/process.md | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/release/backporting.md b/src/release/backporting.md index f88f04ba..d71cb6ae 100644 --- a/src/release/backporting.md +++ b/src/release/backporting.md @@ -22,6 +22,7 @@ Getting a PR backported to the beta branch involves the following process: 1. Create a local branch off the `beta` branch. 2. Cherry-pick all of the PRs that have both [`beta-nominated` and `beta-accepted`][nominated-plus-accepted] labels. It is usually preferred to not include PRs that have not been merged in case there are any last minute changes, or it fails when running the full CI tests. + 3. Run `./x.py run replace-version-placeholder` and if there were any changes, put them into a new commit. 3. (Recommended) Run some tests locally. It is not uncommon that the backports may not apply cleanly, or the UI tests need to be re-blessed if there are differences in the output. 4. Open a PR **against the beta branch** with a title that starts with `[beta]` (so reviewers can see its specialness). diff --git a/src/release/process.md b/src/release/process.md index 77bd90c0..145e6ad9 100644 --- a/src/release/process.md +++ b/src/release/process.md @@ -25,7 +25,13 @@ time, but make sure the stable promotion lands first. ``` Once that's done, send a PR to the freshly created beta branch of rust-lang/rust -which updates `src/ci/channel` to `beta`. +with two commits: + +* The changes caused by running `./x.py run replace-version-placeholder` +* An update of `src/ci/channel` to `beta` + +The version placeholder replacement changes must be in a separate commit so +that they can be cherry picked to the master branch. Also send a PR to rust-lang/rust targeting the new stable branch making the following changes: @@ -49,6 +55,10 @@ credentials][awscli] and run this command from the [simpleinfra] repository: Send a PR to the master branch to: +- Cherry pick the commit that ran `./x.py run replace-version-placeholder` + from the now merged beta branch PR. Do not re-run the tool as there might + have been other stabilizations on master which were not included in the + branched beta, so may not be attributed to the current release. - Run `./x.py run src/tools/bump-stage0` to update the bootstrap compiler to the beta you created yesterday.