Skip to content

Commit

Permalink
Auto merge of #1355 - steffengy:master, r=alexcrichton
Browse files Browse the repository at this point in the history
Update Dependencies & Bump to 1.11.0

This makes proper architecture (=faster) windows builds available for **1.12.0**.

I sneaked some version updates in to ensure that we're a step closer
to a consistent state on that front.

Some open points:
- [ ] 1. Should we add a special case to self_update which
makes the windows fixes available on **1.11.0** (this) already?
e.g. hardcoding the version [somewhere](https://github.com/rust-lang-nursery/rustup.rs/blob/0068f0999acb923428cbd709650c57fbe04a0344/src/rustup-cli/self_update.rs#L1497) in the windows update logic introducted.
This potentially could lead to infinite looping, if we're not careful.
- [ ] 2. Any objections against the updates? Splitting them into a separate PR would be fine.
       (Not sure if CI even passes at this point, but we'll see)

r? @alexcrichton
  • Loading branch information
bors committed Feb 13, 2018
2 parents 35bfc26 + 745cf43 commit e751ff9
Show file tree
Hide file tree
Showing 11 changed files with 286 additions and 225 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 1.11.0

* [windows: detect architecture on website, update to matching arch][pr1354]

[pr1354]: https://github.com/rust-lang-nursery/rustup.rs/pull/1354

Contributors: Steffen Butzer

# 1.10.0

* [Warn when tools are missing and allow an override][pr1337]
Expand Down
Loading

0 comments on commit e751ff9

Please sign in to comment.