From 1f90af8e67b7d6de340a1e0d57fa07098f186124 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Wed, 8 Jan 2020 23:17:38 +0900 Subject: [PATCH] ci: refactor list of env vars --- .travis.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3542fc3..4350eab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: - os: linux language: cpp compiler: gcc - env: COMPILER="g++-5" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="g++-5" CXX_STANDARD=11 addons: apt: sources: @@ -17,7 +17,7 @@ matrix: - os: linux language: cpp compiler: gcc - env: COMPILER="g++-6" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="g++-6" CXX_STANDARD=11 addons: apt: sources: @@ -29,7 +29,7 @@ matrix: - os: linux language: cpp compiler: gcc - env: COMPILER="g++-7" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="g++-7" CXX_STANDARD=11 addons: apt: sources: @@ -41,7 +41,7 @@ matrix: - os: linux language: cpp compiler: gcc - env: COMPILER="g++-8" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="g++-8" CXX_STANDARD=11 addons: apt: sources: @@ -65,7 +65,7 @@ matrix: - os: linux language: cpp compiler: gcc - env: COMPILER="g++-8" CXX_STANDARD=17 TOML_HEAD=OFF + env: COMPILER="g++-8" CXX_STANDARD=17 addons: apt: sources: @@ -89,7 +89,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-3.9" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-3.9" CXX_STANDARD=11 addons: apt: sources: @@ -103,7 +103,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-4.0" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-4.0" CXX_STANDARD=11 addons: apt: sources: @@ -117,7 +117,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-5.0" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-5.0" CXX_STANDARD=11 addons: apt: sources: @@ -131,7 +131,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-6.0" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-6.0" CXX_STANDARD=11 addons: apt: sources: @@ -145,7 +145,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-7" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-7" CXX_STANDARD=11 addons: apt: sources: @@ -159,7 +159,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-8" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-8" CXX_STANDARD=11 addons: apt: sources: @@ -187,7 +187,7 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-8" CXX_STANDARD=17 TOML_HEAD=OFF + env: COMPILER="clang++-8" CXX_STANDARD=17 addons: apt: sources: @@ -234,6 +234,11 @@ script: tar xf cmake-3.14.5-Linux-x86_64.tar.gz -C cmake --strip-components=1 export PATH=${TRAVIS_BUILD_DIR}/cmake/bin:${PATH} fi +- | + if [[ "${TOML_HEAD}" != "ON" ]]; then + export TOML_HEAD="OFF" + fi +- echo "TOML_HEAD = ${TOML_HEAD}" - cmake --version - mkdir build - cd build