Permalink
Browse files

Auto merge of #41505 - alexcrichton:stable-next, r=alexcrichton

[stable] Prepare the 1.17.0 release

* Update channel we're building
* Update the cargo submodule to the tip of the `rust-1.17.0` branch
  • Loading branch information...
bors committed Apr 24, 2017
2 parents 3cc1e39 + 980cf05 commit 56124baa9e73f28c0709e59e74783cf234a978cf
Showing with 2 additions and 2 deletions.
  1. +1 −1 cargo
  2. +1 −1 src/ci/run.sh
@@ -41,7 +41,7 @@ fi
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually.
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=stable"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then

0 comments on commit 56124ba

Please sign in to comment.