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

Prepare the 1.23.0 stable release * Update the release channel to `stable` * Update the Cargo submodule to the latest tip for 1.23.0
rust-lang · Jan 1, 2018 · 766bd11 · 766bd11
2 parents 2b55e35 + cb7348b
commit 766bd11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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.
 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

diff --git a/src/tools/cargo b/src/tools/cargo