🔥 clean Travis
This commit is contained in:
parent
f7ada0a8e1
commit
3d0812a382
36
.travis.yml
36
.travis.yml
@ -17,38 +17,6 @@ group: edge
|
|||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
|
||||||
# check amalgamation
|
|
||||||
- os: linux
|
|
||||||
compiler: gcc
|
|
||||||
env:
|
|
||||||
- COMPILER=g++-4.9
|
|
||||||
- SPECIAL=amalgamation
|
|
||||||
- MULTIPLE_HEADERS=ON
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.9', 'astyle', 'ninja-build']
|
|
||||||
after_success:
|
|
||||||
- make check-amalgamation
|
|
||||||
|
|
||||||
# Coveralls (http://gronlier.fr/blog/2015/01/adding-code-coverage-to-your-c-project/)
|
|
||||||
|
|
||||||
- os: linux
|
|
||||||
compiler: gcc
|
|
||||||
dist: bionic
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-7', 'ninja-build']
|
|
||||||
before_script:
|
|
||||||
- pip install --user cpp-coveralls
|
|
||||||
after_success:
|
|
||||||
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-7' --gcov-options '\-lp'
|
|
||||||
env:
|
|
||||||
- COMPILER=g++-7
|
|
||||||
- CMAKE_OPTIONS=-DJSON_Coverage=ON
|
|
||||||
- MULTIPLE_HEADERS=ON
|
|
||||||
|
|
||||||
# Coverity (only for branch coverity_scan)
|
# Coverity (only for branch coverity_scan)
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
@ -252,15 +220,13 @@ script:
|
|||||||
|
|
||||||
# make sure CXX is correctly set
|
# make sure CXX is correctly set
|
||||||
- if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
|
- if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
|
||||||
# by default, use the single-header version
|
|
||||||
- if [[ "${MULTIPLE_HEADERS}" == "" ]]; then export MULTIPLE_HEADERS=OFF; fi
|
|
||||||
|
|
||||||
# append CXX_STANDARD to CMAKE_OPTIONS if required
|
# append CXX_STANDARD to CMAKE_OPTIONS if required
|
||||||
- CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON}
|
- CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON}
|
||||||
|
|
||||||
# compile and execute unit tests
|
# compile and execute unit tests
|
||||||
- mkdir -p build && cd build
|
- mkdir -p build && cd build
|
||||||
- cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release
|
- cmake .. ${CMAKE_OPTIONS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release
|
||||||
- ctest -C Release --timeout 2700 -V -j
|
- ctest -C Release --timeout 2700 -V -j
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user