summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-20 12:09:08 +0000
committerbors <bors@rust-lang.org>2019-05-20 12:09:08 +0000
commit3c235d5600393dfe6c36eeed34042efad8d4f26e (patch)
treea00b084edd8ce8febb9b5906d031223e7b60c42d /src/ci
parent02b0ca3adb6078217b34494bd94c6e35af988b5e (diff)
parentd53e43528381da5102776648fa8c930bc492c4b9 (diff)
downloadrust-1.35.0.tar.gz
rust-1.35.0.zip
Auto merge of #60974 - pietroalbini:stable-next, r=pietroalbini 1.35.0
[stable] Rust 1.35.0 stable release

This also cherry-picks this beta backport:

* #60710: Use `delay_span_bug` for error cases when checking `AnonConst` parent

r? @ghost
cc @Mark-Simulacrum @rust-lang/release
Diffstat (limited to 'src/ci')
-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 07e01b7e1e0..3606f547208 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -43,7 +43,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"