diff --git a/.travis.yml b/.travis.yml index 0c10d1769e..d8adba7f8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,15 +26,10 @@ # THE SOFTWARE. # -sudo: false - language: cpp -os: - - linux - - osx - dist: xenial +osx_image: xcode10 addons: apt: @@ -53,11 +48,9 @@ install: - if [ -n "$GCC_VERSION" ]; then export CC="${CC}-${GCC_VERSION}"; fi - if [ -n "$GCC_VERSION" ]; then export CXX="${CXX}-${GCC_VERSION}"; fi -compiler: - - clang - - gcc - matrix: + fast_finish: true + include: - os: linux compiler: gcc @@ -67,18 +60,9 @@ matrix: compiler: gcc env: GCC_VERSION=7 - exclude: - os: osx - compiler: gcc - - - os: linux compiler: clang - - os: linux - compiler: gcc - - fast_finish: true - script: - if [ $TRAVIS_OS_NAME == linux ]; then chmod +x ./scripts/travis/build-linux.sh ; ./scripts/travis/build-linux.sh ; fi - if [ $TRAVIS_OS_NAME == osx ]; then chmod +x ./scripts/travis/build-macos.sh ; ./scripts/travis/build-macos.sh ; fi