Skip to content

Commit

Permalink
Merge pull request #685 from brson/bump
Browse files Browse the repository at this point in the history
Bump version to 0.6.1
  • Loading branch information
brson authored Aug 24, 2016
2 parents 285f8ed + ccc4c21 commit 71f7482
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 25 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 0.6.1

* [Fix mysterious crash on OS X 10.10+](https://github.com/rust-lang-nursery/rustup.rs/pull/684)
* [Fix `component remove` command and add a test for it](https://github.com/rust-lang-nursery/rustup.rs/pull/683)

Contributors: Brian Anderson, Diggory Blake

# 0.6.0

* [Print rustup version after update](https://github.com/rust-lang-nursery/rustup.rs/pull/614)
Expand Down
24 changes: 12 additions & 12 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.0"
version = "0.6.1"
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.0" }
rustup-utils = { path = "src/rustup-utils", version = "0.6.0" }
rustup-dist = { path = "src/rustup-dist", version = "0.6.1" }
rustup-utils = { path = "src/rustup-utils", version = "0.6.1" }
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.0" }
rustup-mock = { path = "src/rustup-mock", version = "0.6.1" }
lazy_static = "0.1.15"

[workspace]
Expand Down
4 changes: 3 additions & 1 deletion ci/sync-dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# between the dev environment (dev-static.rlo), the local machine, and
# the prod environment (static.rlo). It's used during the deployment process.
#
# It does only a few things:
# It does only a few things (this is the release process!):
#
# * Sync dev bins to local host:
# python sync-dist.py dev-to-local
Expand All @@ -15,6 +15,8 @@
#
# * Sync local bins to prod
# python sync-dist.py local-to-prod
#
# Don't forget to tag the release, dummy!

import sys
import os
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.0"
version = "0.6.1"
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.0" }
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
error-chain = "0.4.0"
rustup-mock = { path = "../rustup-mock", version = "0.6.0" }
rustup-mock = { path = "../rustup-mock", version = "0.6.1" }

[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.0"
version = "0.6.1"
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.0" }
rustup-utils = { path = "../rustup-utils", version = "0.6.1" }
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.0"
version = "0.6.1"
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.0"
version = "0.6.1"
authors = ["Patrick Reisert"]
build = "build.rs"

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

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

0 comments on commit 71f7482

Please sign in to comment.