From 5bba73a8caf7b75f6313a5cdc0f68ffd1383d76c Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Tue, 15 Oct 2019 20:27:27 +0900 Subject: [PATCH 1/4] ci: use addons in OS X on Travis.CI --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ddf2e8..19ecfda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -216,6 +216,12 @@ matrix: language: cpp compiler: clang env: CXX_STANDARD=11 + addons: + homebrew: + update: true + packages: + - cmake + - boost script: - | @@ -224,8 +230,6 @@ script: travis_retry wget "https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.tar.gz" tar xf cmake-3.14.5-Linux-x86_64.tar.gz -C cmake --strip-components=1 export PATH=${TRAVIS_BUILD_DIR}/cmake/bin:${PATH} - else - brew upgrade cmake boost fi - cmake --version - mkdir build From ea24a91f4cc51068530dddcaf6199760ece3f19f Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Tue, 15 Oct 2019 20:32:09 +0900 Subject: [PATCH 2/4] ci: use `sourceline` --- .travis.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19ecfda..d98a18f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-5 @@ -21,7 +21,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-6 @@ -33,7 +33,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-7 @@ -45,7 +45,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-8 @@ -57,7 +57,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-8 @@ -69,7 +69,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-8 @@ -81,7 +81,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-8 @@ -93,8 +93,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 + - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' packages: - g++-8 @@ -107,7 +106,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-4.0 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -121,7 +120,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-5.0 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -135,7 +134,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-6.0 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -149,7 +148,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-7 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -163,7 +162,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -177,7 +176,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -191,7 +190,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' packages: @@ -205,7 +204,7 @@ matrix: addons: apt: sources: - - ubuntu-toolchain-r-test + - sourceline: 'ppa:ubuntu-toolchain-r/test' - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' packages: From 3dc3b001ffa266e7d5f90928aaa35c986c1fb8eb Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Tue, 15 Oct 2019 21:31:45 +0900 Subject: [PATCH 3/4] ci: update clang 3.x from 3.7 to 3.9 --- .travis.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d98a18f..47de972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,15 +89,16 @@ matrix: - os: linux language: cpp compiler: clang - env: COMPILER="clang++-3.7" CXX_STANDARD=11 TOML_HEAD=OFF + env: COMPILER="clang++-3.9" CXX_STANDARD=11 TOML_HEAD=OFF addons: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-3.9 packages: - g++-8 - - clang-3.7 + - clang-3.9 - boost1.70 - os: linux language: cpp @@ -107,8 +108,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-4.0 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-4.0 packages: - g++-8 - clang-4.0 @@ -121,8 +122,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-5.0 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-5.0 packages: - g++-8 - clang-5.0 @@ -135,8 +136,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-6.0 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-6.0 packages: - g++-8 - clang-6.0 @@ -149,8 +150,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-7 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-7 packages: - g++-8 - clang-7 @@ -163,8 +164,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-8 packages: - g++-8 - clang-8 @@ -177,8 +178,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-8 packages: - g++-8 - clang-8 @@ -191,8 +192,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-8 packages: - clang-8 - g++-8 @@ -205,8 +206,8 @@ matrix: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - llvm-toolchain-trusty-8 - sourceline: 'ppa:mhier/libboost-latest' + - llvm-toolchain-trusty-8 packages: - clang-8 - g++-8 From 354cfc979a3cbfbcd2b83df349e9fb222b400442 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Tue, 15 Oct 2019 21:40:37 +0900 Subject: [PATCH 4/4] ci: cache brew directory --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 47de972..3542fc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -216,6 +216,9 @@ matrix: language: cpp compiler: clang env: CXX_STANDARD=11 + cache: + directories: + - $HOME/Library/Caches/Homebrew addons: homebrew: update: true @@ -238,3 +241,10 @@ script: - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DTOML11_USE_UNRELEASED_TOML_FEATURES=${TOML_HEAD} .. - make - ctest --output-on-failure + +# https://stackoverflow.com/a/53331571 +before_cache: +- | + if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then + brew cleanup + fi