Skip to content

Pin builds to 2016-08-10 and bump version #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ install:
- sudo pip install awscli
- aws configure set preview.cloudfront true
- curl https://static.rust-lang.org/rustup.sh |
sh -s -- --prefix=$HOME/rust --spec=nightly --with-target=$TARGET
sh -s -- --prefix=$HOME/rust --spec=nightly-2016-08-10 --with-target=$TARGET

script:
- mkdir target
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 0.6.2

* [Add basic autocompletion for Zsh](https://github.com/rust-lang-nursery/rustup.rs/pull/689)
* [Sort toolchains by semantic version](https://github.com/rust-lang-nursery/rustup.rs/pull/688)

Contributors: Brian Anderson, Diggory Blake, Knight, Marco A L Barbosa

# 0.6.1

* [Fix mysterious crash on OS X 10.10+](https://github.com/rust-lang-nursery/rustup.rs/pull/684)
Expand Down
61 changes: 39 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup"
version = "0.6.1"
version = "0.6.2"
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
description = "multirust in rust - manage multiple rust installations with ease"

Expand Down Expand Up @@ -32,8 +32,8 @@ no-self-update = []
msi-installed = []

[dependencies]
rustup-dist = { path = "src/rustup-dist", version = "0.6.1" }
rustup-utils = { path = "src/rustup-utils", version = "0.6.1" }
rustup-dist = { path = "src/rustup-dist", version = "0.6.2" }
rustup-utils = { path = "src/rustup-utils", version = "0.6.2" }
download = { path = "src/download" }
error-chain = "0.4.0"
clap = "2.2.4"
Expand All @@ -59,7 +59,7 @@ user32-sys = "0.1.2"
kernel32-sys = "0.2.1"

[dev-dependencies]
rustup-mock = { path = "src/rustup-mock", version = "0.6.1" }
rustup-mock = { path = "src/rustup-mock", version = "0.6.2" }
lazy_static = "0.1.15"

[workspace]
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install:
- curl -sSf -o rustup-init.exe https://dev-static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe
- rustup-init.exe -y
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- rustup default nightly-x86_64-pc-windows-msvc
- rustup default nightly-2016-08-10-x86_64-pc-windows-msvc

# Install the target we're compiling for
- if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
Expand Down
6 changes: 3 additions & 3 deletions src/rustup-dist/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-dist"
version = "0.6.1"
version = "0.6.2"
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
description = "Installation from a Rust distribution server"
build = "build.rs"
Expand All @@ -23,9 +23,9 @@ tempdir = "0.3.4"
walkdir = "0.1.5"
toml = "0.1.27"
sha2 = "0.1.2"
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
rustup-utils = { path = "../rustup-utils", version = "0.6.2" }
error-chain = "0.4.0"
rustup-mock = { path = "../rustup-mock", version = "0.6.1" }
rustup-mock = { path = "../rustup-mock", version = "0.6.2" }

[target."cfg(windows)".dependencies]
winapi = "0.2.8"
Expand Down
4 changes: 2 additions & 2 deletions src/rustup-mock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-mock"
version = "0.6.1"
version = "0.6.2"
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
description = "Test mocks for multirust"

Expand All @@ -19,7 +19,7 @@ tempdir = "0.3.4"
itertools = "0.4.1"
tar = "0.4.0"
toml = "0.1.27"
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
rustup-utils = { path = "../rustup-utils", version = "0.6.2" }
sha2 = "0.1.2"
wait-timeout = "0.1.3"

Expand Down
2 changes: 1 addition & 1 deletion src/rustup-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustup-utils"
version = "0.6.1"
version = "0.6.2"
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
description = "multirust in rust - manage multiple rust installations with ease"

Expand Down
4 changes: 2 additions & 2 deletions src/rustup-win-installer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustup-win-installer"
version = "0.6.1"
version = "0.6.2"
authors = ["Patrick Reisert"]
build = "build.rs"

Expand All @@ -10,4 +10,4 @@ crate-type = ["cdylib"]

[dependencies]
winapi = "0.2"
rustup = { path = "../../", version = "0.6.1" }
rustup = { path = "../../", version = "0.6.2" }