Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes reflecting the new placeholder system for stabilizations #643

Merged
merged 1 commit into from
Aug 28, 2022
Merged

Changes reflecting the new placeholder system for stabilizations #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/release/backporting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
12 changes: 11 additions & 1 deletion src/release/process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.

Expand Down