From 541a3658c2c52788964a1e75625027a6b8f0f7f7 Mon Sep 17 00:00:00 2001 From: Maciej Waruszewski Date: Thu, 10 Jan 2019 11:57:58 +0100 Subject: [PATCH 1/5] [Travis] try using latest boost --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa23be0c..3efeed05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,9 @@ addons: packages: - g++-6 - clang-4.0 + - boost1.67 sources: &sources + - sourceline: 'ppa:mhier/libboost-latest' - ubuntu-toolchain-r-test - llvm-toolchain-trusty-4.0 @@ -92,9 +94,8 @@ install: # downloads and setups local clang on osx - if [[ $TEST_SUITE == 'osx_local_clang' ]]; then . ./.travis_scripts/setup_local_clang.sh; fi - # boost - - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install libboost1.55-all-dev; fi - + # latest boost is installed using addons functionality + # cmake - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install cmake; fi From c20459f84ce81c362d7882213ea7e791c430e6a2 Mon Sep 17 00:00:00 2001 From: Maciej Waruszewski Date: Thu, 10 Jan 2019 12:20:13 +0100 Subject: [PATCH 2/5] [Travis] try getting the latest cmake (only for linux so far) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3efeed05..0a0c3314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,8 @@ install: # latest boost is installed using addons functionality # cmake - - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install cmake; fi + - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh; fi + - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo sh cmake-3.13.2-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir; fi # blitz - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install blitz; fi From 21bd7ba9e26a640962fad02d896faf1728d93176 Mon Sep 17 00:00:00 2001 From: Maciej Waruszewski Date: Thu, 10 Jan 2019 12:37:06 +0100 Subject: [PATCH 3/5] [Travis] forgot wget --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a0c3314..dc1bfa7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ install: # latest boost is installed using addons functionality # cmake - - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh; fi + - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then wget https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh; fi - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo sh cmake-3.13.2-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir; fi # blitz From f87bd59060c94b027360cda19c866ef54c718081 Mon Sep 17 00:00:00 2001 From: Maciej Waruszewski Date: Thu, 10 Jan 2019 12:50:49 +0100 Subject: [PATCH 4/5] [Travis] try changing PATH --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dc1bfa7f..95184d49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,9 +64,11 @@ before_install: - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -; fi # https://github.com/travis-ci/travis-ci/issues/10165 - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then rvm get stable; fi + + # locally installed stuff comes first + - export PATH=/usr/local/bin:$PATH # fixing broken OSX gzip tools - - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then export PATH=/usr/local/bin:$PATH; fi # so that brew-installed ones are first - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install gzip; fi # to avoid problems with plotting by paraview on Travis From 056310be61918672ca2bbbe721e5aeb813ed32b2 Mon Sep 17 00:00:00 2001 From: Maciej Waruszewski Date: Fri, 11 Jan 2019 17:36:48 +0100 Subject: [PATCH 5/5] [Travis] try using boost from a different ppa --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95184d49..28d8e125 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ addons: packages: - g++-6 - clang-4.0 - - boost1.67 + - boost1.61 sources: &sources - - sourceline: 'ppa:mhier/libboost-latest' + - sourceline: 'ppa:rakhimov/boost' - ubuntu-toolchain-r-test - llvm-toolchain-trusty-4.0