commit c84d394176c252f31c0d14ca62e7e0940a2202f8 Author: Isis Lovecruft isis@torproject.org Date: Mon Jul 24 18:53:18 2017 +0000

Install optional dependencies during Travis CI builds.

(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04) --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml index 6ce2b87a9..c8b9382f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,15 @@ sudo: false addons: apt: packages: + ## Required dependencies - libevent-dev - libseccomp2 - zlib1g-dev + ## Optional dependencies + - liblzma-dev + - libscrypt-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd

## The build matrix in the following two stanzas expands into four builds (per OS): ## @@ -65,10 +71,14 @@ before_install: - curl -Ssf -o rustup.sh https://sh.rustup.rs

install: - ## If we're on OSX use brew to install dependencies (for Linux, see the "apt:" section above) + ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated openssl || brew upgrade openssl; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libevent || brew upgrade libevent; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated pkg-config || brew upgrade pkg-config; }; fi + ## If we're on OSX also install the optional dependencies + - 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 nightly channels of rustc and cargo and setup our toolchain environment - sh rustup.sh -y --default-toolchain nightly - source $HOME/.cargo/env