commit e81001a0884b389a3218247f68b19facdf474f2c Merge: 0971b3ce4 e8c7d7d3b Author: teor teor@torproject.org Date: Tue Sep 18 19:34:53 2018 +1000

Merge branch 'bug27738-029' into bug27738-032

Resolve conflicts due to modified comments, and deleted lines.

.travis.yml | 47 ++++++++++++++++++++++++++++------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 19 deletions(-)

diff --cc .travis.yml index 82eeecb58,939f4f4e9..878175f66 --- a/.travis.yml +++ b/.travis.yml @@@ -114,12 -97,9 +117,12 @@@ addons - zlib1g-dev ## Optional dependencies - libcap-dev + - liblzma-dev - libscrypt-dev - libseccomp-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl @@@ -131,44 -132,16 +155,29 @@@ ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4

+before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi + ## Create empty rust directories for non-Rust builds, so caching succeeds + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi + install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## 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 we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - 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 ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi