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

bors · bors · commit a77568041034 · 2018-05-07T17:29:43.000Z
Stable release 1.26.0
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -44,7 +44,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
`@@ -44,7 +44,7 @@ fi`
`44`	`44`	`#`
`45`	`45`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`46`	`46`	`# either automatically or manually.`
`47`		`-export RUST_RELEASE_CHANNEL=beta`
	`47`	`+export RUST_RELEASE_CHANNEL=stable`
`48`	`48`	`if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then`
`49`	`49`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`50`	`50`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`