diff options
| author | teor <teor@torproject.org> | 2018-08-10 19:06:32 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 19:06:32 +1000 |
| commit | 6463cdea55bbeb711a10153156a4b93f2471d034 (patch) | |
| tree | b0662286827dabb564217630d7b798f5a7573fa2 /.travis.yml | |
| parent | ed1210d0f11d21ce97823f88bf20d3659a8927cf (diff) | |
| parent | e2eec40c4469c10dfb3006dfb07240d7e1144aa7 (diff) | |
| download | tor-6463cdea55bbeb711a10153156a4b93f2471d034.tar.gz tor-6463cdea55bbeb711a10153156a4b93f2471d034.zip | |
Merge branch 'travis-osx-032' into travis-osx-033
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index bfb3e7b51f..09bd04505c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,6 +146,7 @@ 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 |