diff options
| author | Isis Lovecruft <isis@torproject.org> | 2017-07-24 18:53:18 +0000 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2017-07-25 00:54:01 +0000 |
| commit | f2e3d13930c88eb010b96b13570b273eda0b1ea5 (patch) | |
| tree | f6b75b1c554982a0d438ca7142c33e1e14781379 | |
| parent | d0cabbf2c5b940bedda588ec4f52c710359ec75a (diff) | |
| download | tor-f2e3d13930c88eb010b96b13570b273eda0b1ea5.tar.gz tor-f2e3d13930c88eb010b96b13570b273eda0b1ea5.zip | |
Install optional dependencies during Travis CI builds.
(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0c6bc8211f..6fe7a9b666 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): ## @@ -62,10 +68,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 script: - ./autogen.sh |