From 226d70c7a7ce2b1ce40ea71daad53a07368361f4 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 25 Oct 2019 15:46:53 +0200 Subject: [PATCH 1/2] .travis.yml: Use global env variables for more readable matrix As we tend to add more env variables for customizing the builds, the lines get longer and longer. To improve readability we now define the defaults as global and only override the ones we need to. --- .travis.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a3e98a42..3adccdb0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,21 @@ dist: xenial language: cpp env: + global: + - SONAR_SCANNER=OFF + - COVERALLS=OFF + - RUN_TESTS=ON + - STOCK_CPPZMQ=ON + - USE_PCH=OFF + - CMAKE_BUILD_TYPE=Debug + - TANGO_USE_USING_NAMESPACE=ON matrix: - - OS_TYPE=gcc-latest CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON STOCK_CPPZMQ=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=ON - - OS_TYPE=debian10 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF RUN_TESTS=ON STOCK_CPPZMQ=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=ON - - OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release SONAR_SCANNER=OFF COVERALLS=OFF RUN_TESTS=ON STOCK_CPPZMQ=ON - - OS_TYPE=debian9 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF RUN_TESTS=ON STOCK_CPPZMQ=ON - - OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON RUN_TESTS=ON STOCK_CPPZMQ=OFF - - OS_TYPE=debian7 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF RUN_TESTS=ON STOCK_CPPZMQ=ON + - OS_TYPE=gcc-latest RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=ON + - OS_TYPE=debian10 + - OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release + - OS_TYPE=debian9 + - OS_TYPE=debian8 STOCK_CPPZMQ=OFF + - OS_TYPE=debian7 notifications: email: false From 912d1886b857f3ba96eba036d8608ba85d313d85 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 25 Oct 2019 15:51:45 +0200 Subject: [PATCH 2/2] .travis.yml: Default USE_PCH to ON And also add one more job which ensure that not using PCH still compiles. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3adccdb0b..ae209ed4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,13 @@ env: - COVERALLS=OFF - RUN_TESTS=ON - STOCK_CPPZMQ=ON - - USE_PCH=OFF + - USE_PCH=ON - CMAKE_BUILD_TYPE=Debug - TANGO_USE_USING_NAMESPACE=ON matrix: - - OS_TYPE=gcc-latest RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON TANGO_USE_USING_NAMESPACE=OFF USE_PCH=ON + - OS_TYPE=gcc-latest RUN_TESTS=OFF WARNINGS_AS_ERRORS=ON TANGO_USE_USING_NAMESPACE=OFF - OS_TYPE=debian10 + - OS_TYPE=debian10 USE_PCH=OFF RUN_TESTS=OFF - OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release - OS_TYPE=debian9 - OS_TYPE=debian8 STOCK_CPPZMQ=OFF