Skip to content

Commit

Permalink
Auto merge of #41505 - alexcrichton:stable-next, r=alexcrichton
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@bors
bors committed Apr 24, 2017
2 parents 3cc1e39 + 980cf05 commit 56124ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cargo
Submodule cargo updated 17 files
+197 −219 Cargo.lock
+1 −2 Cargo.toml
+2 −14 src/bin/init.rs
+2 −14 src/bin/new.rs
+1 −2 src/cargo/lib.rs
+76 −252 src/cargo/ops/cargo_new.rs
+1 −1 src/cargo/sources/git/mod.rs
+0 −18 src/cargo/sources/git/utils.rs
+0 −8 src/cargo/util/errors.rs
+0 −1 src/cargo/util/mod.rs
+0 −237 src/cargo/util/template.rs
+0 −89 src/doc/guide.md
+0 −1 src/etc/_cargo
+1 −1 src/etc/cargo.bashcomp.sh
+3 −3 tests/build-auth.rs
+10 −45 tests/init.rs
+2 −82 tests/new.rs
2 changes: 1 addition & 1 deletion src/ci/run.sh
View file
Expand Up @@ -41,7 +41,7 @@ fi
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually. # either automatically or manually.
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then 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" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"


if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
Expand Down

0 comments on commit 56124ba

Please sign in to comment.