Merge branch 'develop' into coverity_scan

This commit is contained in:
Niels Lohmann 2016-12-18 18:17:51 +01:00
commit ab64419bb6

View file

@ -98,9 +98,6 @@ matrix:
compiler: clang 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 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: addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['valgrind']
coverity_scan: coverity_scan:
project: project:
name: "nlohmann/json" name: "nlohmann/json"