commit e387eee362fc5c73b7b54c2e887d08816732a0ae
Author: teor <t...@torproject.org>
Date: Thu Aug 9 22:52:51 2018 +1000
Travis: add rust cargo offline mode
Backports parts of the 0.3.3 travis config.
Part of 24629.
---
.travis.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 43392b3f4..8d300004a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,9 @@ matrix:
# - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
- env: ASCIIDOC_OPTIONS="" DISTCHECK="yes"
+ ## 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=""
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
@@ -140,6 +143,8 @@ install:
## 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
+ ## 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
##
## Finally, list installed package versions
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
