[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.3.2] Travis: add lzma and zstd, where available
commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd
Author: teor <teor@xxxxxxxxxxxxxx>
Date: Thu Aug 9 19:33:28 2018 +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.
---
.travis.yml | 5 +++++
changes/bug27090 | 3 +++
2 files changed, 8 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 9671411b4..e61c3ba8b 100644
--- 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
new file mode 100644
index 000000000..3d119a9c3
--- /dev/null
+++ 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.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits