Auto merge of #56455 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum

bors · bors · commit bdb3f532d7a3 · 2018-12-03T18:25:36.000Z
Stable 1.31.0 release This also includes a patch to the edition guide inclusion such that it should actually get built. It will need to be forward-ported to master (and beta, but that'll come as master/beta promotion). cc @rust-lang/release
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=beta
+export RUST_RELEASE_CHANNEL=stable
 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"

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=beta`
	`54`	`+export RUST_RELEASE_CHANNEL=stable`
`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"`