Merge pull request #431 from Mark-Simulacrum/promote-after-branching

Document new release branching

Author: pietroalbini

src/release/process.md

@@ -2,6 +2,15 @@
 
 Here's how Rust is currently released:
 
+## Promote beta to stable (T-6 days, Friday the week before)
+
+Open a PR bumping the version number in `src/bootstrap/channel.rs`. r+
+rollup=never this PR.
+
+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 beta to stable. Temporarily turn off GitHub branch protection for the
@@ -50,6 +59,14 @@ docker exec -d -it rcs bash -c 'promote-release /tmp/stable stable /data/secrets
 
 ## Promote master to beta (T-2 days, Tuesday)
 
+We need to find out the parent commit in which the PR opened last Monday merged.
+
+Go to that PR, and find the "bors merged commit $SHA into rust-lang:master at the bottom.
+
+Locally, run `export BRANCH_POINT=`git rev-parse $SHA^` in the rust-lang/rust
+checkout. This should be bors-authored merge into master of the PR before the
+version bump merged.
+
 Create a new branch on `rust-lang/cargo` for the new beta. Here, `rust-lang` is
 the remote for https://github.com/rust-lang/rust.git. Replace `YY` with the
 minor version of master. First determine the branch point for cargo in
@@ -58,7 +75,7 @@ minor version of master. First determine the branch point for cargo in
 ```sh
 $ cd rust
 $ git fetch rust-lang
-$ CARGO_SHA=`git rev-parse rust-lang/master:src/tools/cargo`
+$ CARGO_SHA=`git rev-parse $BRANCH_POINT:src/tools/cargo`
 $ cd src/tools/cargo
 $ git branch rust-1.YY.0 $CARGO_SHA
 $ git push origin rust-1.YY.0
@@ -67,15 +84,12 @@ $ git push origin rust-1.YY.0
 You'll need to temporarily disable branch protection on GitHub to push the new
 branch.
 
-In theory one day we'll do the same for rust-lang/rls, but for now we haven't
-done this yet.
-
 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:
 
 ```sh
 $ git fetch rust-lang
-$ git push rust-lang rust-lang/master:beta -f
+$ git push rust-lang $BRANCH_POINT:beta -f
 ```
 
 Re-enable branch protection on GitHub. Send a PR to the freshly created beta
@@ -91,19 +105,13 @@ branch of rust-lang/rust which:
   - Uncomment `dev: 1`
 - Update src/ci/run.sh to pass "--release-channel=beta".
 
-Note that you probably don't want to update the RLS if it's working, but if it's
-not working beta won't land and it'll need to get updated. After this PR merges
-(through @bors) the beta should be automatically released.
-
 ## Master bootstrap update (T-1 day, Wednesday)
 
-Write a new blog post, update rust-www, and update rust-forge. Submit PRs for
-tomorrow.
-
 Send a PR to the master branch to:
 
 - modify src/stage0.txt to bootstrap from yesterday's beta
-- modify src/bootstrap/channel.rs with the new version number
+- Remove `cfg(stage0)` annotated items
+- Replace `cfg(not(stage0))` with nothing
 
 ## Release day (Thursday)
 
@@ -154,18 +162,6 @@ Decide on a time to do the release, T.
 
 Bask in your success.
 
-## Update dependencies (T+1 day, Friday)
-
-In the repo:
-
-```bash
-$ cd src
-$ cargo update
-```
-
-The very ambitious can use https://crates.io/crates/cargo-outdated and update
-through breaking changes.
-
 ## Publishing a nightly based off a try build
 
 Sometimes a PR requires testing how it behaves when downloaded from rustup, for