Skip to content

Commit 9103b3e

Browse files
committed
update the release process with bump-stage0
This PR updates the release process following up on the addition of the bump-stage0 tool in the rust-lang/rust monorepo, making these changes: * Downloading artifacts from dev-static.rust-lang.org is not supported anymore, so the step to bump stage0 during beta promotion is removed. This doesn't have any practical effect, as we're still building the new beta with the previous beta. * As there is no dependency anymore between promoting beta and promoting stable both are moved to the same day, bringing the master bootstrap update one day earlier. * The step to update the beta bootstrap compiler after the release was updated to use the tool.
1 parent af340f8 commit 9103b3e

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

src/release/process.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ Mark it as `rollup=never`, because if it lands in a rollup as *not* the first
1111
PR then other pull requests in that rollup will be incorrectly associated with
1212
the prior release.
1313

14-
## Promote beta to stable (T-3 days, Monday)
14+
## Promote branches (T-3 days, Monday)
15+
16+
Both promotions should happen on Monday. You can open both PRs at the same
17+
time, but make sure the stable promotion lands first.
18+
19+
### Beta to stable
1520

1621
Temporarily turn off GitHub branch protection for the `stable` branch in
1722
rust-lang/rust repo. In your local Rust repo:
@@ -47,7 +52,7 @@ Test rustup with:
4752
RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup update stable
4853
```
4954

50-
## Promote master to beta (T-2 days, Tuesday)
55+
### Master to beta
5156

5257
Gather the relevant information and push the new Cargo branch:
5358

@@ -70,22 +75,14 @@ git push git@github.com:rust-lang/rust $BRANCH_POINT:beta -f
7075
```
7176

7277
Re-enable branch protection on GitHub. Send a PR to the freshly created beta
73-
branch of rust-lang/rust which:
74-
75-
- Update `src/stage0.txt`
76-
- Change `date` to "YYYY-MM-DD" where the date is the archive date the stable
77-
build was uploaded
78-
- Change `rustc` to "X.Y.Z" where that's the version of rustc you just build
79-
- Comment `rustfmt: nightly-YYYY-MM-DD`
80-
- Uncomment `dev: 1`
81-
- Update `src/ci/channel` to `beta`
78+
branch of rust-lang/rust which updates `src/ci/channel` to `beta`.
8279

83-
## Master bootstrap update (T-1 day, Wednesday)
80+
## Master bootstrap update (T-2 day, Tuesday)
8481

8582
Send a PR to the master branch to:
8683

87-
- Update `src/stage0.txt` to change `date` to "YYYY-MM-DD" where the date is
88-
the archive date when the beta build was uploaded.
84+
- Run `./x.py run src/tools/bump-stage0` to update the bootstrap compiler to
85+
the beta you created yesterday.
8986

9087
- Remove references to the `bootstrap` and `not(bootstrap)` conditional
9188
compilation attributes. You can find all of them by installing [ripgrep] and
@@ -157,8 +154,9 @@ Decide on a time to do the release, T.
157154
git push git@github.com:rust-lang/cargo.git $CARGO_VERSION
158155
```
159156

160-
- **T+1hr** Send a PR to the beta branch to comment out `dev: 1` again and
161-
update the date to download from (modifying `src/stage0.txt`).
157+
- **T+1hr** Send a PR to the beta branch running `./x.py run
158+
src/tools/bump-stage0` to bump the boostrap compiler to the stable you
159+
just released.
162160

163161
[update-thanks]: https://github.com/rust-lang/thanks/actions/workflows/ci.yml
164162

0 commit comments

Comments
 (0)