Skip to content

Update the release process with bump-stage0 #566

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

Merged
merged 2 commits into from
Sep 6, 2021
Merged

Update the release process with bump-stage0 #566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9103b3e
update the release process with bump-stage0
pietroalbini Sep 6, 2021
09e3d84
remove "yesterday"
pietroalbini Sep 6, 2021
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
32 changes: 15 additions & 17 deletions src/release/process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ Mark it as `rollup=never`, because if it lands in a rollup as *not* the first
PR then other pull requests in that rollup will be incorrectly associated with
the prior release.

## Promote beta to stable (T-3 days, Monday)
## Promote branches (T-3 days, Monday)

Both promotions should happen on Monday. You can open both PRs at the same
time, but make sure the stable promotion lands first.

### Beta to stable

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

## Promote master to beta (T-2 days, Tuesday)
### Master to beta

Gather the relevant information and push the new Cargo branch:

Expand All @@ -63,29 +68,21 @@ git push git@github.com:rust-lang/cargo rust-$NEW_BETA_VERSION
```

Temporarily disable banch protection on GitHub for the `beta` branch of the Rust
repo. Promote rust-lang/rust's master branch to beta as with yesterday:
repo. Promote rust-lang/rust's master branch to beta as you did for stable:

```sh
git push git@github.com:rust-lang/rust $BRANCH_POINT:beta -f
```

Re-enable branch protection on GitHub. Send a PR to the freshly created beta
branch of rust-lang/rust which:

- Update `src/stage0.txt`
- Change `date` to "YYYY-MM-DD" where the date is the archive date the stable
build was uploaded
- Change `rustc` to "X.Y.Z" where that's the version of rustc you just build
- Comment `rustfmt: nightly-YYYY-MM-DD`
- Uncomment `dev: 1`
- Update `src/ci/channel` to `beta`
branch of rust-lang/rust which updates `src/ci/channel` to `beta`.

## Master bootstrap update (T-1 day, Wednesday)
## Master bootstrap update (T-2 day, Tuesday)

Send a PR to the master branch to:

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

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

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

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

Expand Down