From c259456282cbee087605ee37dd3632f4afdfbde1 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Sun, 22 Mar 2020 20:40:02 +0900 Subject: [PATCH] ci: fix Travis.CI OS X build --- .travis.yml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22757ca..2c93831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -293,16 +293,6 @@ matrix: - os: osx language: cpp compiler: clang - env: CXX_STANDARD=11 - cache: - directories: - - $HOME/Library/Caches/Homebrew - addons: - homebrew: - update: true - packages: - - cmake - - boost script: - | @@ -312,6 +302,10 @@ 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 [[ "${CXX_STANDARD}" == "" ]]; then + export CXX_STANDARD="11" + fi - | if [[ "${TOML_HEAD}" != "ON" ]]; then export TOML_HEAD="OFF" @@ -330,13 +324,8 @@ script: - cmake --version - mkdir build - cd build +- echo "COMPILER = ${COMPILER}" +- echo "CXX_STANDARD = ${CXX_STANDARD}" - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DTOML11_USE_UNRELEASED_TOML_FEATURES=${TOML_HEAD} -Dtoml11_TEST_WITH_ASAN=${WITH_ASAN} -Dtoml11_TEST_WITH_UBSAN=${WITH_UBSAN} .. - make - ctest --output-on-failure - -# https://stackoverflow.com/a/53331571 -before_cache: -- | - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - brew cleanup - fi