Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-10-29 23:31:35 +0100
committerMartin Hořeňovský2019-10-29 23:32:24 +0100
commitac4958395c651ff90a63a3a32c45d7cb46b41d86 (patch)
treece04637159a623f62b82fa24a9e69f5f175a3848
parent316a5c0572c903e47a2e5aaf87d8bf8624077590 (diff)
downloadcatch3-ac4958395c651ff90a63a3a32c45d7cb46b41d86.tar.gz
Rejigger OSX images on Travis
-rw-r--r--.travis.yml22
1 files changed, 9 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 1ed9d063..ffd785ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -183,24 +183,25 @@ matrix:
# 5/ OSX Clang Builds
- os: osx
- osx_image: xcode8
+ osx_image: xcode9.4
compiler: clang
- env: COMPILER='clang++'
+ env: COMPILER='clang++' CPP14=1
- os: osx
- osx_image: xcode9
+ osx_image: xcode10.3
compiler: clang
- env: COMPILER='clang++'
+ env: COMPILER='clang++' CPP14=1
- os: osx
- osx_image: xcode9.1
+ osx_image: xcode11.2
compiler: clang
- env: COMPILER='clang++'
+ env: COMPILER='clang++' CPP14=1
- os: osx
- osx_image: xcode9.1
+ osx_image: xcode11.2
compiler: clang
- env: COMPILER='clang++' CPP14=1
+ env: COMPILER='clang++' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
+
# 6/ Special builds -- examples, coverage, valgrind, etc.
- os: linux
@@ -229,11 +230,6 @@ matrix:
packages: ['valgrind', 'lcov', 'g++-7']
env: COMPILER='g++-7' CPP14=1 VALGRIND=1
- - os: osx
- osx_image: xcode9.1
- compiler: clang
- env: COMPILER='clang++' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
-
# 7/ C++17 builds
- os: linux
compiler: gcc