diff options
author | teor <teor@torproject.org> | 2018-08-10 19:05:49 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2018-08-10 19:06:01 +1000 |
commit | e2eec40c4469c10dfb3006dfb07240d7e1144aa7 (patch) | |
tree | b246e6ead544538d6f2a720d6c93fc5c0bd36046 /.travis.yml | |
parent | 69adc68ac6031246f9c5a723755c87d6abf34fc6 (diff) | |
parent | d514e98663fbac3107d02f492fbff9d6018c275d (diff) | |
download | tor-e2eec40c4469c10dfb3006dfb07240d7e1144aa7.tar.gz tor-e2eec40c4469c10dfb3006dfb07240d7e1144aa7.zip |
Merge branch 'travis-osx-029' into travis-osx-032
Merge asciidoc from 029 with rust from 032.
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 f92a3d8d41..1b43c721a3 100644 --- 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 |