sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only install Rust in CI if RUST_OPTIONS is set. 

(cherry picked from commit e5dd07a4c64fd2a4132ab1f6dec64640a95da35e)
This commit is contained in:
Isis Lovecruft 2017-07-24 20:25:25 +00:00
parent c84d394176
commit 1d42316f49
No known key found for this signature in database
GPG Key ID: C8E8B1AA4CF3844E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -68,7 +68,7 @@ before_install:
## If we're on OSX, homebrew usually needs to updated first
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
## Download rustup
- curl -Ssf -o rustup.sh https://sh.rustup.rs
- if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
install:
## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)
@ -80,13 +80,13 @@ install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; fi
## Install the nightly channels of rustc and cargo and setup our toolchain environment
- sh rustup.sh -y --default-toolchain nightly
- source $HOME/.cargo/env
- if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi
- if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
## Get some info about rustc and cargo
- which rustc
- which cargo
- rustc --version
- cargo --version
- if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
- if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi
- if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi
- if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi
script:
- ./autogen.sh