mirror of
https://github.com/catchorg/Catch2.git
synced 2024-12-23 11:43:29 +01:00
Rejigger OSX images on Travis
This commit is contained in:
parent
316a5c0572
commit
ac4958395c
38
.travis.yml
38
.travis.yml
@ -183,25 +183,26 @@ matrix:
|
|||||||
|
|
||||||
# 5/ OSX Clang Builds
|
# 5/ OSX Clang Builds
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode8
|
osx_image: xcode9.4
|
||||||
compiler: clang
|
|
||||||
env: COMPILER='clang++'
|
|
||||||
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9
|
|
||||||
compiler: clang
|
|
||||||
env: COMPILER='clang++'
|
|
||||||
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.1
|
|
||||||
compiler: clang
|
|
||||||
env: COMPILER='clang++'
|
|
||||||
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.1
|
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: COMPILER='clang++' CPP14=1
|
env: COMPILER='clang++' CPP14=1
|
||||||
|
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode10.3
|
||||||
|
compiler: clang
|
||||||
|
env: COMPILER='clang++' CPP14=1
|
||||||
|
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode11.2
|
||||||
|
compiler: clang
|
||||||
|
env: COMPILER='clang++' CPP14=1
|
||||||
|
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode11.2
|
||||||
|
compiler: clang
|
||||||
|
env: COMPILER='clang++' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
|
||||||
|
|
||||||
|
|
||||||
# 6/ Special builds -- examples, coverage, valgrind, etc.
|
# 6/ Special builds -- examples, coverage, valgrind, etc.
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
@ -229,11 +230,6 @@ matrix:
|
|||||||
packages: ['valgrind', 'lcov', 'g++-7']
|
packages: ['valgrind', 'lcov', 'g++-7']
|
||||||
env: COMPILER='g++-7' CPP14=1 VALGRIND=1
|
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
|
# 7/ C++17 builds
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
Loading…
Reference in New Issue
Block a user