Skip to content

Commit cfdfae2

Browse files
authored
Merge pull request #694 from brson/bump
Pin builds to 2016-08-10 and bump version
2 parents 0f46f3f + bef8879 commit cfdfae2

File tree

9 files changed

+60
-36
lines changed

9 files changed

+60
-36
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ install:
9090
- sudo pip install awscli
9191
- aws configure set preview.cloudfront true
9292
- curl https://static.rust-lang.org/rustup.sh |
93-
sh -s -- --prefix=$HOME/rust --spec=nightly --with-target=$TARGET
93+
sh -s -- --prefix=$HOME/rust --spec=nightly-2016-08-10 --with-target=$TARGET
9494

9595
script:
9696
- mkdir target

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 0.6.2
2+
3+
* [Add basic autocompletion for Zsh](https://github.com/rust-lang-nursery/rustup.rs/pull/689)
4+
* [Sort toolchains by semantic version](https://github.com/rust-lang-nursery/rustup.rs/pull/688)
5+
6+
Contributors: Brian Anderson, Diggory Blake, Knight, Marco A L Barbosa
7+
18
# 0.6.1
29

310
* [Fix mysterious crash on OS X 10.10+](https://github.com/rust-lang-nursery/rustup.rs/pull/684)

Cargo.lock

Lines changed: 39 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rustup"
4-
version = "0.6.1"
4+
version = "0.6.2"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "multirust in rust - manage multiple rust installations with ease"
77

@@ -32,8 +32,8 @@ no-self-update = []
3232
msi-installed = []
3333

3434
[dependencies]
35-
rustup-dist = { path = "src/rustup-dist", version = "0.6.1" }
36-
rustup-utils = { path = "src/rustup-utils", version = "0.6.1" }
35+
rustup-dist = { path = "src/rustup-dist", version = "0.6.2" }
36+
rustup-utils = { path = "src/rustup-utils", version = "0.6.2" }
3737
download = { path = "src/download" }
3838
error-chain = "0.4.0"
3939
clap = "2.2.4"
@@ -59,7 +59,7 @@ user32-sys = "0.1.2"
5959
kernel32-sys = "0.2.1"
6060

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

6565
[workspace]

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install:
2424
- curl -sSf -o rustup-init.exe https://dev-static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe
2525
- rustup-init.exe -y
2626
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
27-
- rustup default nightly-x86_64-pc-windows-msvc
27+
- rustup default nightly-2016-08-10-x86_64-pc-windows-msvc
2828

2929
# Install the target we're compiling for
3030
- if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%

src/rustup-dist/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rustup-dist"
4-
version = "0.6.1"
4+
version = "0.6.2"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "Installation from a Rust distribution server"
77
build = "build.rs"
@@ -23,9 +23,9 @@ tempdir = "0.3.4"
2323
walkdir = "0.1.5"
2424
toml = "0.1.27"
2525
sha2 = "0.1.2"
26-
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
26+
rustup-utils = { path = "../rustup-utils", version = "0.6.2" }
2727
error-chain = "0.4.0"
28-
rustup-mock = { path = "../rustup-mock", version = "0.6.1" }
28+
rustup-mock = { path = "../rustup-mock", version = "0.6.2" }
2929

3030
[target."cfg(windows)".dependencies]
3131
winapi = "0.2.8"

src/rustup-mock/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rustup-mock"
4-
version = "0.6.1"
4+
version = "0.6.2"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "Test mocks for multirust"
77

@@ -19,7 +19,7 @@ tempdir = "0.3.4"
1919
itertools = "0.4.1"
2020
tar = "0.4.0"
2121
toml = "0.1.27"
22-
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
22+
rustup-utils = { path = "../rustup-utils", version = "0.6.2" }
2323
sha2 = "0.1.2"
2424
wait-timeout = "0.1.3"
2525

src/rustup-utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rustup-utils"
4-
version = "0.6.1"
4+
version = "0.6.2"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "multirust in rust - manage multiple rust installations with ease"
77

src/rustup-win-installer/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rustup-win-installer"
3-
version = "0.6.1"
3+
version = "0.6.2"
44
authors = ["Patrick Reisert"]
55
build = "build.rs"
66

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

1111
[dependencies]
1212
winapi = "0.2"
13-
rustup = { path = "../../", version = "0.6.1" }
13+
rustup = { path = "../../", version = "0.6.2" }

0 commit comments

Comments
 (0)