diff options
| author | teor <teor@torproject.org> | 2018-08-10 16:31:35 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 16:31:35 +1000 |
| commit | 69adc68ac6031246f9c5a723755c87d6abf34fc6 (patch) | |
| tree | 4fc194bfceab1a124cfa41057d0b510a6c2ea2ed | |
| parent | 169afe3ca52fc8b201f00fe8b262c75e79a199d5 (diff) | |
| parent | e78f9c5dfb55e71fa79c152d13a1ff72fd907040 (diff) | |
| download | tor-69adc68ac6031246f9c5a723755c87d6abf34fc6.tar.gz tor-69adc68ac6031246f9c5a723755c87d6abf34fc6.zip | |
Merge branch 'travis-osx-029' into travis-osx-032
Simple merge to resolve order conflicts.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | changes/ticket24629 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9f1bc70e84..f92a3d8d41 100644 --- 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 without hardening (see above), or distcheck ## Distcheck doesn't work with rust in 0.3.2 ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 @@ -146,6 +146,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 new file mode 100644 index 0000000000..482c0a1a6d --- /dev/null +++ b/changes/ticket24629 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Enable macOS builds in our Travis CI configuration. + Closes ticket 24629. |