diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-03 12:22:48 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-03 12:22:48 +0200 |
| commit | 0ca6f0ddd0f1739e4e4b492e29c43c50694baa5c (patch) | |
| tree | 6b9559de2bf9513dba9ecbd4578078197504c160 | |
| parent | Use std::exception for the login response (diff) | |
| download | nheko-0ca6f0ddd0f1739e4e4b492e29c43c50694baa5c.tar.xz | |
Bump gcc and clang version
| -rwxr-xr-x | .ci/linux/run-tests.sh | 3 | ||||
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.ci/linux/run-tests.sh b/.ci/linux/run-tests.sh index ae0c7b77..dc9e303c 100755 --- a/.ci/linux/run-tests.sh +++ b/.ci/linux/run-tests.sh @@ -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 diff --git a/.travis.yml b/.travis.yml index 3aa112d8..159482f2 100644 --- a/.travis.yml +++ b/.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 diff --git a/README.md b/README.md index 41ee62a1..7e06f56c 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ sudo emerge -a nheko - [LMDB](https://symas.com/lightning-memory-mapped-database/). - A compiler that supports C++11. - Clang 3.3 (or greater). - - GCC 4.8 (or greater). + - GCC 4.9.4 (or greater). ##### Arch Linux |