From 4bd78c4b8ee80b66dc1e5ee04d32f813fd9a7e7b Mon Sep 17 00:00:00 2001 From: "Gabriel A. Devenyi" Date: Wed, 5 Feb 2020 09:19:25 -0500 Subject: [PATCH 1/2] Add xcode11.3 to travis --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index b23a67995..8cf5c76e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -154,6 +154,17 @@ matrix: - gcc@9 update: yes #OSX clang starts here + - os: osx + osx_image: xcode11.3 + env: + - MATRIX_EVAL="" + addons: + homebrew: + packages: + - cmake + - ccache + - ninja + update: yes - os: osx osx_image: xcode11.2 env: From 552a0ca13653392f9f77cd8544c280bb035fcd5c Mon Sep 17 00:00:00 2001 From: "Gabriel A. Devenyi" Date: Wed, 5 Feb 2020 09:19:52 -0500 Subject: [PATCH 2/2] Cut back traivs timeout by 10 minutes to ensure build cache is populated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8cf5c76e5..2ee0056fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -339,4 +339,4 @@ script: - export ExternalData_OBJECT_STORES=${TRAVIS_BUILD_DIR}/externalobjects - "export PATH=\"$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}')\"" - cmake -GNinja -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DRUN_LONG_TESTS=OFF -DRUN_SHORT_TESTS=ON .. - - ../buildscripts/travis-command-wrapper.py -s "date" --deadline=$(( $(python -c "import time; print(int(time.time()))") + 4500 )) -- cmake --build . --parallel && cd ANTS-build && ctest -j2 + - ../buildscripts/travis-command-wrapper.py -s "date" --deadline=$(( $(python -c "import time; print(int(time.time()))") + 3900 )) -- cmake --build . --parallel && cd ANTS-build && ctest -j2