commit 4e6d754f3537fdfab871cbea48000b396a7b5dec
parent 19038ff4bbcc50e0d9fa3d38c20689ea0da1b9c2
Author: teor <teor@torproject.org>
Date: Fri, 10 Aug 2018 16:42:13 +1000
Merge branch 'travis-osx-034' into travis-osx-master
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -148,6 +148,7 @@ install:
- if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
## 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 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