[tor-commits] [tor/release-0.3.2] Merge branch 'travis-osx-029' into travis-osx-032

[nickm at torproject.org]

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7
Merge: 69adc68ac d514e9866
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 19:05:49 2018 +1000

    Merge branch 'travis-osx-029' into travis-osx-032
    
    Merge asciidoc from 029 with rust from 032.

 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --cc .travis.yml
index f92a3d8d4,8b8621007..1b43c721a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -147,13 -125,7 +147,14 @@@ install
    ## 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 [[ "$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