diff options
| author | Alexander Batischev <eual.jp@gmail.com> | 2017-09-02 15:53:21 +0300 |
|---|---|---|
| committer | Alexander Batischev <eual.jp@gmail.com> | 2017-09-02 18:06:13 +0300 |
| commit | 8fcb2da9695b9672126db1391f22406c818d80d7 (patch) | |
| tree | b756ef24a3076cd8c0eeef6ffa0a2efbf4f30041 | |
| parent | 9c5bfd2285cbb2c402637a9eba10ba20bc9e40ac (diff) | |
Travis: install deps via config on OS X
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | travis-get-deps.sh | 20 |
2 files changed, 18 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index 21950a7c..c422c701 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,20 @@ addons: - *global_deps - g++-4.9 # required for someniceties in C++ standard library +newsbeuter_brew_commands: &osx_deps + - brew outdated "pkg-config" || brew upgrade "pkg-config" + - brew install "gettext" && brew link --force "gettext" + - brew outdated "sqlite" || brew upgrade "sqlite" + - brew outdated "curl" || brew upgrade "curl" + - brew install "libstfl" + - brew outdated "json-c" || brew upgrade "json-c" + - brew install "asciidoc" + - brew outdated "python" || brew upgrade "python" + - brew install "pyenv" || brew upgrade "pyenv" + - eval "$(pyenv init -)" + - pip2 install cpp-coveralls + - pyenv rehash + matrix: fast_finish: true include: @@ -113,6 +127,8 @@ matrix: # a2x will run xmllint on generated files, so we have to pass the path # to AsciiDoc's catalog files - XML_CATALOG_FILES=/usr/local/etc/xml/catalog + before_install: + *osx_deps - compiler: clang os: osx env: @@ -121,6 +137,8 @@ matrix: # a2x will run xmllint on generated files, so we have to pass the path # to AsciiDoc's catalog files - XML_CATALOG_FILES=/usr/local/etc/xml/catalog + before_install: + *osx_deps - addons: apt: packages: @@ -131,7 +149,6 @@ matrix: install: - export CXX=$COMPILER - cd ${TRAVIS_BUILD_DIR} - - if [ -z "$CHECKS" ]; then ./travis-get-deps.sh ; fi script: - cd ${TRAVIS_BUILD_DIR} diff --git a/travis-get-deps.sh b/travis-get-deps.sh deleted file mode 100755 index 3e4deb70..00000000 --- a/travis-get-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -case $TRAVIS_OS_NAME in - "osx") - brew update - brew outdated "pkg-config" || brew upgrade "pkg-config" - brew install "gettext" && brew link --force "gettext" - brew outdated "sqlite" || brew upgrade "sqlite" - brew outdated "curl" || brew upgrade "curl" - brew install "libstfl" - brew outdated "json-c" || brew upgrade "json-c" - brew install "asciidoc" - - brew install "python" - brew install "pyenv" - eval "$(pyenv init -)" - pip install cpp-coveralls - pyenv rehash - ;; -esac |