diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6a3e1bfc01..8dcbf1fe9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,13 @@ env: global: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" + matrix: + ## Leave at least one entry here or Travis seems to generate a + ## matrix entry with empty matrix environment variables. Leaving + ## more than one entry causes unwanted matrix entries with + ## unspecified compilers. + - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # - RUST_OPTIONS="" matrix: ## Uncomment to allow the build to report success (with non-required @@ -89,6 +96,8 @@ matrix: include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" + - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" - compiler: gcc env: DISTCHECK="yes" @@ -98,12 +107,15 @@ matrix: ## longer allows ptrace. - compiler: clang sudo: required + - compiler: clang + sudo: required + env: RUST_OPTIONS="" 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 - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: @@ -115,6 +127,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 stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; 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 |