Bump gcc and clang version
This commit is contained in:
parent
3ea2053b25
commit
0ca6f0ddd0
@ -2,7 +2,6 @@
|
||||
|
||||
set -evx
|
||||
|
||||
cmake -DBUILD_TESTS=ON -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
|
||||
make -C build -j2
|
||||
cmake -DBUILD_TESTS=ON -H. -Bbuild && cmake --build build
|
||||
|
||||
cd build && GTEST_COLOR=1 ctest --verbose
|
||||
|
16
.travis.yml
16
.travis.yml
@ -12,17 +12,33 @@ matrix:
|
||||
compiler: clang
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-6
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: ['g++-6']
|
||||
- os: linux
|
||||
compiler: clang
|
||||
- COMPILER=clang++-5.0
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
|
||||
packages: ['clang-5.0']
|
||||
|
||||
before_install:
|
||||
- export CXX=${COMPILER}
|
||||
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/gtest.sh; fi
|
||||
|
||||
install:
|
||||
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5 lmdb clang-format; fi
|
||||
- if [ $TRAVIS_OS_NAME == osx ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5; fi
|
||||
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/install-deps.sh; fi
|
||||
|
||||
before_script:
|
||||
- if [ $TRAVIS_OS_NAME == linux ]; then source /opt/qt59/bin/qt59-env.sh; fi
|
||||
- cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
script:
|
||||
- make -C build -j2
|
||||
- if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi
|
||||
|
Loading…
Reference in New Issue
Block a user