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

bors · bors · commit 56124baa9e73 · 2017-04-24T18:48:38.000Z
[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
diff --git a/cargo b/cargo
@@ -1 +1 @@
-Subproject commit d8d0940a97a83ed2e4eb340cafea4ed7f601f158
+Subproject commit fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666
diff --git a/src/ci/run.sh b/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
