summary refs log tree commit diff
path: root/src/ci/run.sh
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-13 06:25:52 +0000
committerbors <bors@rust-lang.org>2019-08-13 06:25:52 +0000
commiteae3437dfe991621e8afdc82734f4a172d7ddf9b (patch)
tree8936a353a9fe2195322baf40de256354626bbbcc /src/ci/run.sh
parent3f55461efb25b3c8b5c5c3d829065cb032ec953b (diff)
parentc9be294d11352614f6f0eaa7161df325b9300de2 (diff)
downloadrust-1.37.0.tar.gz
rust-1.37.0.zip
Auto merge of #63498 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.37.0
1.37.0 stable

This promotes beta to stable and backports a few PRs:

 - Avoid ICE when referencing desugared local binding in borrow error (#63051)
 - Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b
Diffstat (limited to 'src/ci/run.sh')
-rwxr-xr-xsrc/ci/run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index e5e0e6cf603..f19bd4e7ec7 100755
--- 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"