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

bors · bors · commit 4d90ac38c0b6 · 2018-02-12T18:47:03.000Z
Prepare stable release for 1.24.0

Cargo submodule appears to already be at tip and RLS has no branch to sync to (or 1.23.0 branch).
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -42,7 +42,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
`@@ -42,7 +42,7 @@ fi`
`42`	`42`	`#`
`43`	`43`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`44`	`44`	`# either automatically or manually.`
`45`		`-export RUST_RELEASE_CHANNEL=beta`
	`45`	`+export RUST_RELEASE_CHANNEL=stable`
`46`	`46`	`if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then`
`47`	`47`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`48`	`48`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`