diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-10 15:58:42 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-10 19:32:51 +0900 |
| commit | ecda3a007ed504d3c6b64b7895082107222d62f7 (patch) | |
| tree | 324c8b979824ff204c5de26e0da132b4492cc861 | |
| parent | 6c4e78e8a55eab681393faff888448c887bb7127 (diff) | |
| download | libquotient-ecda3a007ed504d3c6b64b7895082107222d62f7.tar.gz libquotient-ecda3a007ed504d3c6b64b7895082107222d62f7.zip | |
.travis.yml: switch to xenial and Qt 5.9
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index cb932120..d859c69c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: cpp +dist: xenial git: depth: false @@ -14,20 +15,18 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - sourceline: 'ppa:beineri/opt-qt571-trusty' + - sourceline: 'ppa:beineri/opt-qt597-xenial' packages: - ninja-build - - g++-5 - - qt57base - - qt57multimedia + - libgl1-mesa-dev # Forgotten Qt dep + - qt59base + - qt59multimedia - valgrind - - clang-format-6.0 matrix: include: - os: linux compiler: gcc - env: [ 'ENV_EVAL="CC=gcc-5 && CXX=g++-5"' ] - os: linux compiler: clang - os: osx @@ -41,7 +40,7 @@ matrix: before_install: - eval "${ENV_EVAL}" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then USE_NINJA="-GNinja"; VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt57/bin/qt57-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then USE_NINJA="-GNinja"; VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt59/bin/qt59-env.sh; fi install: - pushd 3rdparty/libQtOlm |