diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 19:01:55 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-25 19:01:55 +0900 |
| commit | b1014408917dd900f029924802433321f1eb5ac4 (patch) | |
| tree | 9520f8ebd8c1f2755bb9e122db559ab0366cdd5d /.travis.yml | |
| parent | 7ef5d0b10ae214f7c58aa77fb84547be1388f2d6 (diff) | |
| download | libquotient-b1014408917dd900f029924802433321f1eb5ac4.tar.gz libquotient-b1014408917dd900f029924802433321f1eb5ac4.zip | |
Fix CI
Old GCC was still invoked; qmake-based builds weren't switched to C++14.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index f033f3dd..e4d66084 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: cpp -os: [ linux, osx ] - -compiler: [ gcc, clang ] - addons: apt: sources: @@ -14,10 +10,17 @@ addons: - qt56base matrix: - exclude: [ { os: osx, compiler: gcc } ] + include: + - os: linux + compiler: gcc + env: [ ENV_EVAL="CC=gcc-5 && CXX=g++-5" ] + - os: linux + compiler: clang + - os: osx + env: [ ENV_EVAL="brew update && brew install qt5 && PATH=/usr/local/opt/qt/bin" ] -install: -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install qt5; export PATH="$PATH:/usr/local/opt/qt/bin"; fi +before_install: +- eval "${ENV_EVAL}" - if [ "$TRAVIS_OS_NAME" = "linux" ]; then . /opt/qt56/bin/qt56-env.sh; fi script: |