diff options
| author | bors <bors@rust-lang.org> | 2017-04-24 18:48:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-24 18:48:38 +0000 |
| commit | 56124baa9e73f28c0709e59e74783cf234a978cf (patch) | |
| tree | f0b3bce2548cc9aadbde7ead33311c8576ff136b | |
| parent | 3cc1e39230502ea727c0bb1bd5bb699cc9f3ddc3 (diff) | |
| parent | 980cf05cdf1d21c9b68e0eb1bd20af58f6a0518a (diff) | |
| download | rust-56124baa9e73f28c0709e59e74783cf234a978cf.tar.gz rust-56124baa9e73f28c0709e59e74783cf234a978cf.zip | |
Auto merge of #41505 - alexcrichton:stable-next, r=alexcrichton 1.17.0
[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
| m--------- | cargo | 0 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cargo b/cargo -Subproject d8d0940a97a83ed2e4eb340cafea4ed7f601f15 +Subproject fe7b0cdcf5ca7aab81630706ce40b70f6aa2e66 diff --git a/src/ci/run.sh b/src/ci/run.sh index 1cd173628dd..228880f6600 100755 --- 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 |