diff options
| author | teor <teor@torproject.org> | 2018-08-10 19:06:45 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 19:06:45 +1000 |
| commit | c28da0d8e105515bafdb8a9710ab965a51b3c4eb (patch) | |
| tree | 256c17136bfb3b2db393291c1e6191e99be43c32 /.travis.yml | |
| parent | a1c110a2a478d3fae50871741d52659cc34f4623 (diff) | |
| parent | 6463cdea55bbeb711a10153156a4b93f2471d034 (diff) | |
| download | tor-c28da0d8e105515bafdb8a9710ab965a51b3c4eb.tar.gz tor-c28da0d8e105515bafdb8a9710ab965a51b3c4eb.zip | |
Merge branch 'travis-osx-033' into travis-osx-034
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 4cd810f80e..7db7577856 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,6 +149,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 |