about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-03 18:25:36 +0000
committerbors <bors@rust-lang.org>2018-12-03 18:25:36 +0000
commitbdb3f532d7a393b1da512dbc1bed65c9eb63846e (patch)
tree1f6fdcb9eef20c816fdb7be8b2e18e20f521fae0
parentd2e3b533202c99fea647a4b616bf2d8a336d8def (diff)
parent5a31783c6c06e396bc93e3ff48bfbfd343900a92 (diff)
Auto merge of #56455 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
Stable 1.31.0 release

This also includes a patch to the edition guide inclusion such that it should actually get built. It will need to be forward-ported to master (and beta, but that'll come as master/beta promotion).

cc @rust-lang/release
-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 f51199de6eb..324c873dd3b 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -51,7 +51,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"