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

bors · bors · commit 4560ea788cb7 · 2019-11-04T15:43:19.000Z
[stable] 1.39.0 release
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -45,7 +45,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" = "1" ]; 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
`@@ -45,7 +45,7 @@ fi`
`45`	`45`	`#`
`46`	`46`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`47`	`47`	`# either automatically or manually.`
`48`		`-export RUST_RELEASE_CHANNEL=beta`
	`48`	`+export RUST_RELEASE_CHANNEL=stable`
`49`	`49`	`if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then`
`50`	`50`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`51`	`51`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`