diff options
author | Marco Poletti <poletti.marco@gmail.com> | 2016-12-22 18:40:46 +0100 |
---|---|---|
committer | Marco Poletti <poletti.marco@gmail.com> | 2016-12-22 18:40:46 +0100 |
commit | 713502b6f67ae94de66d91a3876cebaa4b62d5da (patch) | |
tree | fec650c122e817b4acb32915aa1cfbec2b01c6c5 /.travis.yml | |
parent | c2bf6ed83685555fb491fa926c2fe2d248d9805a (diff) | |
download | google-fruit-713502b6f67ae94de66d91a3876cebaa4b62d5da.tar.gz |
Run OS X tests on a more recent version of OS X (except tests for old GCC/Clang versions).
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index e86bf0c..f7c03ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ matrix: env: COMPILER=gcc-6 TEST=DebugPlain install: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/postsubmit.sh DebugPlain - compiler: clang @@ -62,6 +63,7 @@ matrix: install: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/postsubmit.sh DebugPlain - compiler: clang @@ -298,18 +300,21 @@ matrix: env: COMPILER=gcc-6 TEST=DebugValgrind install: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/postsubmit.sh DebugValgrind - compiler: gcc env: COMPILER=gcc-6 TEST=ReleaseValgrind install: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/postsubmit.sh ReleaseValgrind - compiler: gcc env: COMPILER=gcc-6 TEST=DebugAsanUbsan install: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='gcc-6'; travis_wait 30 extras/scripts/postsubmit.sh DebugAsanUbsan - compiler: clang @@ -331,6 +336,7 @@ matrix: install: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/postsubmit.sh DebugValgrind - compiler: clang @@ -338,6 +344,7 @@ matrix: install: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/travis_ci_install_osx.sh os: osx + osx_image: xcode8.2 script: export OS=osx; export COMPILER='clang-3.8'; export STL='libc++'; travis_wait 30 extras/scripts/postsubmit.sh ReleaseValgrind - compiler: clang |