tor

commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd
parent 38cf52b0238bd95893935936cd5925d176c5bbb8
Author: teor <teor@torproject.org>
Date:   Thu,  9 Aug 2018 19:33:28 +1000

Travis: add lzma and zstd, where available

Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9
merge.

Part of 24629, also fixes 27090.

Diffstat:
M
.travis.yml
 | 
5
+++++
A
changes/bug27090
 | 
3
+++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -85,8 +85,11 @@ addons:
       - zlib1g-dev
       ## Optional dependencies
       - libcap-dev
+      - liblzma-dev
       - libscrypt-dev
       - libseccomp-dev
+      ## zstd doesn't exist in Ubuntu Trusty
+      #- libzstd
       ## Conditional dependencies
       ## Always installed, so we don't need sudo
       - asciidoc
@@ -117,6 +120,8 @@ install:
   # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi
   ## If we're on OSX also install the optional dependencies
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; 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
diff --git a/changes/bug27090 b/changes/bug27090
@@ -0,0 +1,3 @@
+  o Minor bugfixes (continuous integration):
+    - Build with zstd on macOS.
+      Fixes bug 27090; bugfix on 0.3.1.5-alpha.