diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8dcbf1fe9d..9672656a32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ env: ## more than one entry causes unwanted matrix entries with ## unspecified compilers. - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true # - RUST_OPTIONS="" matrix: @@ -96,11 +97,15 @@ matrix: include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: gcc env: RUST_OPTIONS="" - compiler: gcc env: COVERAGE_OPTIONS="--enable-coverage" - compiler: gcc - env: DISTCHECK="yes" + env: DISTCHECK="yes" RUST_OPTIONS="" + - compiler: gcc + env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -109,6 +114,9 @@ matrix: sudo: required - compiler: clang sudo: required + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: clang + sudo: required env: RUST_OPTIONS="" before_install: @@ -135,6 +143,10 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule init ; fi + - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule update; fi + - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi script: - ./autogen.sh |