From 7092890ff1fc6b339a22f90b879e6ffc0369ef33 Mon Sep 17 00:00:00 2001 From: Alexander Karzhenkov Date: Tue, 22 Dec 2020 18:03:50 +0500 Subject: [PATCH 1/3] Properly select the build type for Travis --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f48ee1fd6..4389c0233 100644 --- a/.travis.yml +++ b/.travis.yml @@ -324,10 +324,13 @@ script: # append CXX_STANDARD to CMAKE_OPTIONS if required - CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON} + # build configuration + - CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE=Debug" + # compile and execute unit tests - mkdir -p build && cd build - - cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_ImplicitConversions=${IMPLICIT_CONVERSIONS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release - - ctest -C Release --timeout 2700 -V -j + - cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_ImplicitConversions=${IMPLICIT_CONVERSIONS} -DJSON_BuildTests=On -GNinja && cmake --build . + - ctest --timeout 2700 -V -j - cd .. # check if homebrew works (only checks develop branch) From 10db9184a3d76d6047f9806f047ea3d58ed5c5b9 Mon Sep 17 00:00:00 2001 From: Alexander Karzhenkov Date: Wed, 23 Dec 2020 20:55:02 +0500 Subject: [PATCH 2/3] Configure Travis to build "Release" instead of "Debug" --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4389c0233..a29265a8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -325,7 +325,7 @@ script: - CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON} # build configuration - - CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE=Debug" + - CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE=Release" # compile and execute unit tests - mkdir -p build && cd build From 903b8a6e04fc99687599b446a05ec0b8569e0a55 Mon Sep 17 00:00:00 2001 From: Alexander Karzhenkov Date: Sat, 26 Dec 2020 21:14:16 +0500 Subject: [PATCH 3/3] Build as "Debug" for coverage test --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a29265a8e..e015ac45a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,6 +97,7 @@ matrix: - COMPILER=g++-7 - CMAKE_OPTIONS=-DJSON_Coverage=ON - MULTIPLE_HEADERS=ON + - BUILD_TYPE=Debug # Coverity (only for branch coverity_scan) @@ -324,8 +325,8 @@ script: # append CXX_STANDARD to CMAKE_OPTIONS if required - CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON} - # build configuration - - CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE=Release" + # build configuration (Release by default) + - CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}" # compile and execute unit tests - mkdir -p build && cd build