Skip to content

Rollup of 4 pull requests #41725

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.

Sign up for GitHub

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

Closed
frewsxcv wants to merge 14 commits into from
Closed

Rollup of 4 pull requests #41725

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ac8892b
Accept arbitrary filenames into URLs in build-manifest
ranma42 Apr 25, 2017
5439c9b
Define the unavailable target just once and re-use it
ranma42 Apr 25, 2017
b1ab145
Fix up @martinhath's mailmap entry
May 2, 2017
aa10fce
Update Duration::from_secs doc example to show underlying values.
frewsxcv May 3, 2017
ee8ad8e
Update Duration::from_millis doc example to show underlying values.
frewsxcv May 3, 2017
bdd8e7f
Update Duration::as_secs doc example to demonstrate truncation.
frewsxcv May 3, 2017
a3e8f36
Add doc example for how to determine total number of secs in Duration.
frewsxcv May 3, 2017
28a4f57
Update ChildStdin/ChildStdout docs to be clearer
mgattozzi May 3, 2017
5dfa08e
Emit information about XZ packages in manifest
ranma42 Apr 25, 2017
5e522d7
Fix MacOSX build
ranma42 May 1, 2017
8ada699
Rollup merge of #41600 - ranma42:xz-dist, r=alexcrichton
frewsxcv May 3, 2017
1b76f49
Rollup merge of #41715 - martinhath:master, r=aturon
frewsxcv May 3, 2017
fe04b14
Rollup merge of #41720 - frewsxcv:duration-doc-examples, r=steveklabnik
frewsxcv May 3, 2017
568a18a
Rollup merge of #41721 - mgattozzi:stdin-stdout-update, r=steveklabnik
frewsxcv May 3, 2017
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
Prev Previous commit
Next Next commit
Fix MacOSX build 
MacOSX does not ship `7z` nor `xz`. Let's use `xz`, just like on the
other *nix systems.
  • Loading branch information
@ranma42
ranma42 committed May 3, 2017
commit 5e522d73a3664bbfd0ec5a9ad4efee4165c35d37
12 changes: 9 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ matrix:
MACOSX_DEPLOYMENT_TARGET=10.7
os: osx
osx_image: xcode7
install: *osx_install_sccache
install:
- brew update && brew install xz
- *osx_install_sccache
- env: >
RUST_CHECK_TARGET=dist
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
Expand All @@ -106,7 +108,9 @@ matrix:
MACOSX_DEPLOYMENT_TARGET=10.7
os: osx
osx_image: xcode7
install: *osx_install_sccache
install:
- brew update && brew install xz
- *osx_install_sccache

# "alternate" deployments, these are "nightlies" but don't have assertions
# turned on, they're deployed to a different location primarily for projects
Expand All @@ -123,7 +127,9 @@ matrix:
MACOSX_DEPLOYMENT_TARGET=10.7
os: osx
osx_image: xcode7
install: *osx_install_sccache
install:
- brew update && brew install xz
- *osx_install_sccache

env:
global:
Expand Down