External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install g++-7 with clang-7

Browse Source 
Was g++-6, but the standard lib was too old
This commit is contained in:
Thomas Schaub 2019-03-20 22:29:14 +01:00
parent fdfdb70f75
commit 821517f95d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -284,7 +284,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
packages: ['g++-6', 'clang-7', 'ninja-build'] packages: ['g++-7', 'clang-7', 'ninja-build']
- os: linux - os: linux
compiler: clang compiler: clang
@ -294,7 +294,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
packages: ['g++-6', 'clang-7', 'ninja-build'] packages: ['g++-7', 'clang-7', 'ninja-build']
################ ################
# build script # # build script #
@ -325,10 +325,10 @@ script:
- ctest -C Release -V -j - ctest -C Release -V -j
- cd .. - cd ..
# check if homebrew works (only checks develop branch) # check if homebrew works (only checks develop branch)
- if [ `which brew` ]; then - if [ `which brew` ]; then
brew update ; brew update ;
brew tap nlohmann/json ; brew tap nlohmann/json ;
brew install nlohmann_json --HEAD ; brew install nlohmann_json --HEAD ;
brew test nlohmann_json ; brew test nlohmann_json ;
fi fi