Bump gcc and clang version
This commit is contained in:
parent
3ea2053b25
commit
0ca6f0ddd0
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
set -evx
|
set -evx
|
||||||
|
|
||||||
cmake -DBUILD_TESTS=ON -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
|
cmake -DBUILD_TESTS=ON -H. -Bbuild && cmake --build build
|
||||||
make -C build -j2
|
|
||||||
|
|
||||||
cd build && GTEST_COLOR=1 ctest --verbose
|
cd build && GTEST_COLOR=1 ctest --verbose
|
||||||
|
16
.travis.yml
16
.travis.yml
@ -12,17 +12,33 @@ matrix:
|
|||||||
compiler: clang
|
compiler: clang
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
env:
|
||||||
|
- COMPILER=g++-6
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources: ['ubuntu-toolchain-r-test']
|
||||||
|
packages: ['g++-6']
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
- COMPILER=clang++-5.0
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
|
||||||
|
packages: ['clang-5.0']
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
- export CXX=${COMPILER}
|
||||||
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/gtest.sh; fi
|
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/gtest.sh; fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5 lmdb clang-format; fi
|
- 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 == osx ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5; fi
|
||||||
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/install-deps.sh; fi
|
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/install-deps.sh; fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- if [ $TRAVIS_OS_NAME == linux ]; then source /opt/qt59/bin/qt59-env.sh; fi
|
- if [ $TRAVIS_OS_NAME == linux ]; then source /opt/qt59/bin/qt59-env.sh; fi
|
||||||
- cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
|
- cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- make -C build -j2
|
- make -C build -j2
|
||||||
- if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi
|
- if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi
|
||||||
|
@ -47,7 +47,7 @@ sudo emerge -a nheko
|
|||||||
- [LMDB](https://symas.com/lightning-memory-mapped-database/).
|
- [LMDB](https://symas.com/lightning-memory-mapped-database/).
|
||||||
- A compiler that supports C++11.
|
- A compiler that supports C++11.
|
||||||
- Clang 3.3 (or greater).
|
- Clang 3.3 (or greater).
|
||||||
- GCC 4.8 (or greater).
|
- GCC 4.9.4 (or greater).
|
||||||
|
|
||||||
##### Arch Linux
|
##### Arch Linux
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user