diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:55:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 12:42:18 +1000 |
| commit | 82cccfbe25c3e5b5be14323b545c68c7eb52400c (patch) | |
| tree | 4a8ad9095cbfbcb4b78945a2cd0c56b369fd178b /.travis.yml | |
| parent | f398da2e2d2c2472619b1c42463cbf2ccc84cc6a (diff) | |
| download | tor-82cccfbe25c3e5b5be14323b545c68c7eb52400c.tar.gz tor-82cccfbe25c3e5b5be14323b545c68c7eb52400c.zip | |
Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2.
Re-applies 0.3.3 changes after 24629.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c7ea5948e5..81f449797b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,8 +51,7 @@ matrix: ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" ## Check rust offline without distcheck (see above) - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - env: RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -151,7 +150,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi + - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi |