Auto merge of #54314 - alexcrichton:beta-next, r=alexcrichton

bors · bors · commit 14f51b05d186 · 2018-09-18T01:28:34.000Z
[beta] Prepare the 1.30.0 release

This commit prepares the 1.30.0 beta release for the newly branched beta branch.
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -51,7 +51,7 @@ fi
 #
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
-export RUST_RELEASE_CHANNEL=nightly
+export RUST_RELEASE_CHANNEL=beta
 if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
diff --git a/src/stage0.txt b/src/stage0.txt
@@ -12,9 +12,9 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2018-09-11
-rustc: beta
-cargo: beta
+date: 2018-09-13
+rustc: 1.29.0
+cargo: 0.30.0
 
 # When making a stable release the process currently looks like:
 #

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fi`
`51`	`51`	`#`
`52`	`52`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`53`	`53`	`# either automatically or manually.`
`54`		`-export RUST_RELEASE_CHANNEL=nightly`
	`54`	`+export RUST_RELEASE_CHANNEL=beta`
`55`	`55`	`if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then`
`56`	`56`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`57`	`57`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`