From 76b195d7d12650c48ac673871e8b6f5a1665c1ec Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 10 Aug 2017 20:54:59 +0200 Subject: [PATCH] :construction_worker: fix for coverity + clang-5.0 --- .travis.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8619bdc1..e36e9cd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,6 +120,9 @@ matrix: compiler: clang before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt addons: + apt: + sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] + packages: ['g++-6', 'clang-3.6'] coverity_scan: project: name: "nlohmann/json" @@ -129,8 +132,8 @@ matrix: build_command: "make" branch_pattern: coverity_scan env: - - LLVM_VERSION=3.6.0 - SPECIAL=coverity + - COMPILER=clang++-3.6 # OSX / Clang @@ -249,6 +252,14 @@ matrix: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] packages: ['g++-6', 'clang-4.0'] + - os: linux + compiler: clang + env: COMPILER=clang++-5.0 + addons: + apt: + sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty'] + packages: ['g++-6', 'clang-5.0'] + ################ # build script # ################