about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-01-01 11:20:10 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-01-01 11:20:35 -0800
commitcb7348bf6794371e96147927d707c841dff6c9a3 (patch)
tree5de218a89dc6066440e61e1a6cd73b742c8da75f
parent2b55e3522c0c1f6e0f3d54bd2be97eab0852e57b (diff)
downloadrust-cb7348bf6794371e96147927d707c841dff6c9a3.tar.gz
rust-cb7348bf6794371e96147927d707c841dff6c9a3.zip
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
-rwxr-xr-xsrc/ci/run.sh2
m---------src/tools/cargo0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index ba37e6aee55..3f3836d767a 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.
 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
-Subproject 6a1aee06680d8f074a25431c938c42d7e8d0ab4
+Subproject 45043115c9094d82f0f407ebc7ef7e583f438d1