Skip to content

Commit ddc51a8

Browse files
authored
Merge pull request #430 from mwarusz/latest_boost
[Travis] try using more recent boost
2 parents 5192dbe + 056310b commit ddc51a8

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.travis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ addons:
3737
packages:
3838
- g++-6
3939
- clang-4.0
40+
- boost1.61
4041
sources: &sources
42+
- sourceline: 'ppa:rakhimov/boost'
4143
- ubuntu-toolchain-r-test
4244
- llvm-toolchain-trusty-4.0
4345

@@ -62,9 +64,11 @@ before_install:
6264
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -; fi
6365
# https://github.com/travis-ci/travis-ci/issues/10165
6466
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then rvm get stable; fi
67+
68+
# locally installed stuff comes first
69+
- export PATH=/usr/local/bin:$PATH
6570

6671
# fixing broken OSX gzip tools
67-
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then export PATH=/usr/local/bin:$PATH; fi # so that brew-installed ones are first
6872
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install gzip; fi
6973

7074
# to avoid problems with plotting by paraview on Travis
@@ -92,11 +96,11 @@ install:
9296
# downloads and setups local clang on osx
9397
- if [[ $TEST_SUITE == 'osx_local_clang' ]]; then . ./.travis_scripts/setup_local_clang.sh; fi
9498

95-
# boost
96-
- if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install libboost1.55-all-dev; fi
97-
99+
# latest boost is installed using addons functionality
100+
98101
# cmake
99-
- if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo $apt_get_install cmake; fi
102+
- 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
103+
- if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo sh cmake-3.13.2-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir; fi
100104

101105
# blitz
102106
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install blitz; fi

0 commit comments

Comments
 (0)