tor

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7
parent 69adc68ac6031246f9c5a723755c87d6abf34fc6
Author: teor <teor@torproject.org>
Date:   Fri, 10 Aug 2018 19:05:49 +1000

Merge branch 'travis-osx-029' into travis-osx-032

Merge asciidoc from 029 with rust from 032.

Diffstat:
M
.travis.yml
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -147,6 +147,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