diff options
| author | teor <teor@torproject.org> | 2018-08-10 16:41:27 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 16:41:27 +1000 |
| commit | a1c110a2a478d3fae50871741d52659cc34f4623 (patch) | |
| tree | df33baa3824754d0fce8c5004d294fb090b5de96 /.travis.yml | |
| parent | 2a33edc595a619d6c2abcb260195f92d97192d6a (diff) | |
| parent | ed1210d0f11d21ce97823f88bf20d3659a8927cf (diff) | |
| download | tor-a1c110a2a478d3fae50871741d52659cc34f4623.tar.gz tor-a1c110a2a478d3fae50871741d52659cc34f4623.zip | |
Merge branch 'travis-osx-033' into travis-osx-034
Take the asciidoc changes from 033, and the module changes from
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 a8f9cc5964..4cd810f80e 100644 --- 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 |