Unverified Commit e2eec40c authored by teor's avatar teor
Browse files

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

Merge asciidoc from 029 with rust from 032.
parents 69adc68a d514e986

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ install: 
  ## 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 [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; 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