Unverified Commit 69adc68a authored by teor's avatar teor
Browse files

Merge branch 'travis-osx-029' into travis-osx-032 

Simple merge to resolve order conflicts.
parents 169afe3c e78f9c5d

.travis.yml

+2 −1
Original line number Diff line number Diff line
@@ -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

changes/ticket24629

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (continuous integration):

    - Enable macOS builds in our Travis CI configuration.

      Closes ticket 24629.