diff --git a/.travis.yml b/.travis.yml index 52a80ec9..f0d20524 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,20 +3,21 @@ cache: apt: true directories: - $HOME/Library/Caches/Homebrew +os: + - linux + - osx matrix: include: - os: linux dist: xenial sudo: required - env: BUILD_TYPE=Release UPNP=ON - - os: linux - dist: xenial - sudo: required - env: BUILD_TYPE=Release UPNP=OFF - os: osx env: UPNP=yes - os: osx env: UPNP=no + env: + - BUILD_TYPE=Release UPNP=ON + - BUILD_TYPE=Release UPNP=OFF addons: apt: packages: @@ -38,7 +39,7 @@ compiler: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated || brew upgrade ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade boost ; fi script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_UPNP=${UPNP} && make ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make HOMEBREW=1 USE_UPNP=${UPNP} ; fi