diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index bf55b7756a..3d61f5a61a 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,6 +97,8 @@ 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" @@ -107,6 +110,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: @@ -133,6 +139,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 |