Skip to content

Commit 73e87dd

Browse files
committed
improve steps for the beta promotion
1 parent e06790d commit 73e87dd

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

src/release/process.md

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,38 +49,24 @@ RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup update stable
4949

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

52-
We need to find out the parent commit in which the PR opened last Monday merged.
53-
54-
Go to that PR, and find the "bors merged commit $SHA into rust-lang:master at the bottom.
55-
56-
Locally, run `` export BRANCH_POINT=`git rev-parse $SHA^` `` in the rust-lang/rust
57-
checkout. This should be bors-authored merge into master of the PR before the
58-
version bump merged.
59-
60-
Create a new branch on `rust-lang/cargo` for the new beta. Here, `rust-lang` is
61-
the remote for https://github.com/rust-lang/rust.git. Replace `YY` with the
62-
minor version of master. First determine the branch point for cargo in
63-
`rust-lang/rust`, and then create a new branch:
52+
Gather the relevant information and push the new Cargo branch:
6453

6554
```sh
66-
cd rust
67-
git fetch rust-lang
55+
git fetch [email protected]:rust-lang/rust
56+
BRANCH_POINT=`git log --merges --first-parent --format="%P" -1 master -- src/version | awk '{print($1)}'`
6857
NEW_BETA_VERSION=`git show $BRANCH_POINT:src/version`
6958
CARGO_SHA=`git rev-parse $BRANCH_POINT:src/tools/cargo`
59+
7060
cd src/tools/cargo
7161
git branch rust-$NEW_BETA_VERSION $CARGO_SHA
72-
git push origin rust-$NEW_BETA_VERSION
62+
git push [email protected]:rust-lang/cargo rust-$NEW_BETA_VERSION
7363
```
7464

75-
You'll need to temporarily disable branch protection on GitHub to push the new
76-
branch.
77-
7865
Temporarily disable banch protection on GitHub for the `beta` branch of the Rust
7966
repo. Promote rust-lang/rust's master branch to beta as with yesterday:
8067

8168
```sh
82-
$ git fetch rust-lang
83-
$ git push rust-lang $BRANCH_POINT:beta -f
69+
git push [email protected]:rust-lang/rust $BRANCH_POINT:beta -f
8470
```
8571

8672
Re-enable branch protection on GitHub. Send a PR to the freshly created beta

0 commit comments

Comments
 (0)