diff options
| author | teor <teor@torproject.org> | 2018-09-18 19:36:28 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-09-18 19:37:16 +1000 |
| commit | 49ffc035729f02fa6e6dc49bc24807d8e8503f2b (patch) | |
| tree | 7f3037bee330e52d677fd3c5a909a83c45f93cb4 | |
| parent | e81001a0884b389a3218247f68b19facdf474f2c (diff) | |
| download | tor-49ffc035729f02fa6e6dc49bc24807d8e8503f2b.tar.gz tor-49ffc035729f02fa6e6dc49bc24807d8e8503f2b.zip | |
Travis: use the Homebrew addon for xz and zstd
xz and zstd were added as optional dependencies in 0.3.1.1-alpha.
Implements ticket 27738.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 878175f661..68842419a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,6 +140,8 @@ addons: #- zlib ## Optional dependencies - libscrypt + - xz + - zstd ## Required build dependencies ## Tor needs pkg-config to find some dependencies at build time - pkg-config @@ -162,8 +164,6 @@ before_install: install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features |