3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 03:43:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Travis builds with clang 5/6

Browse Source 
There is some weird broken dependency in their version of Trusty
(14.04 LTE), so we are using Xenial (16.04 LTE) instead.
This commit is contained in:
Martin Hořeňovský 2019-09-06 11:14:48 +02:00
parent 623e348d9e
commit c6bf56b3d5
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -9,8 +9,8 @@ common_sources: &all_sources
- llvm-toolchain-trusty - llvm-toolchain-trusty
- llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-3.9
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-4.0
- llvm-toolchain-trusty-5.0 - llvm-toolchain-xenial-5.0
- llvm-toolchain-trusty-6.0 - llvm-toolchain-xenial-6.0
matrix: matrix:
include: include:
@ -60,6 +60,7 @@ matrix:
env: COMPILER='clang++-4.0' env: COMPILER='clang++-4.0'
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
@ -68,6 +69,7 @@ matrix:
env: COMPILER='clang++-5.0' env: COMPILER='clang++-5.0'
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
@ -153,6 +155,7 @@ matrix:
env: COMPILER='clang++-4.0' CPP14=1 env: COMPILER='clang++-4.0' CPP14=1
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
@ -161,6 +164,7 @@ matrix:
env: COMPILER='clang++-5.0' CPP14=1 env: COMPILER='clang++-5.0' CPP14=1
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
@ -255,6 +259,7 @@ matrix:
env: COMPILER='g++-7' EXAMPLES=1 COVERAGE=1 EXTRAS=1 CPP17=1 env: COMPILER='g++-7' EXAMPLES=1 COVERAGE=1 EXTRAS=1 CPP17=1
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt:
@ -263,6 +268,7 @@ matrix:
env: COMPILER='clang++-6.0' CPP17=1 env: COMPILER='clang++-6.0' CPP17=1
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
addons: addons:
apt: apt: