diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 092bf54f82..8cc210827a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,9 @@ env: global: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" + matrix: + - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + - RUST_OPTIONS="" matrix: ## If one build in the matrix fails (e.g. if building withour Rust and Clang @@ -65,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) @@ -76,6 +79,14 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi - 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 + - 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 + - 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 |