diff options
| author | bors <bors@rust-lang.org> | 2018-01-01 21:47:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-01 21:47:13 +0000 |
| commit | 766bd11c8a3c019ca53febdcd77b2215379dd67d (patch) | |
| tree | 5de218a89dc6066440e61e1a6cd73b742c8da75f /src | |
| parent | 2b55e3522c0c1f6e0f3d54bd2be97eab0852e57b (diff) | |
| parent | cb7348bf6794371e96147927d707c841dff6c9a3 (diff) | |
| download | rust-1.23.0.tar.gz rust-1.23.0.zip | |
Auto merge of #47108 - alexcrichton:stable-next, r=alexcrichton 1.23.0
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
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/run.sh | 2 | ||||
| m--------- | src/tools/cargo | 0 |
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 |