commit ed1210d0f11d21ce97823f88bf20d3659a8927cf
parent 546c134801a17ebb63032b5ac52a65279998ea6f
Author: teor <teor@torproject.org>
Date: Fri, 10 Aug 2018 16:38:13 +1000
Merge branch 'travis-osx-032' into travis-osx-033
Preserve 033 changes since 032.
Diffstat:
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,7 @@ matrix:
## We run rust and coverage with hardening off, which seems like enough
# - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
- - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes"
+ - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
## Check rust offline with distcheck, to make sure we remove rust products
## But without hardening (see above)
- env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
@@ -145,6 +145,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
diff --git a/changes/ticket24629 b/changes/ticket24629
@@ -0,0 +1,3 @@
+ o Minor features (continuous integration):
+ - Enable macOS builds in our Travis CI configuration.
+ Closes ticket 24629.
