[tor-commits] [tor/release-0.3.4] Travis: use the Homebrew addon for xz and zstd
nickm at torproject.org
nickm at torproject.org
Wed Oct 10 21:12:40 UTC 2018
commit 49ffc035729f02fa6e6dc49bc24807d8e8503f2b
Author: teor <teor at torproject.org>
Date: Tue Sep 18 19:36:28 2018 +1000
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.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 878175f66..68842419a 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
More information about the tor-commits
mailing list