From e30b69013e269464495fcda0f0d4065ff10e1c00 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 12 Aug 2019 16:58:31 +0900 Subject: Ok, bionic has its own Qt5 --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d2f5449..5149f6f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,8 @@ cache: addons: apt: - sources: - - sourceline: 'ppa:beineri/opt-qt597-bionic' packages: - ninja-build - - libgl1-mesa-dev # Forgotten Qt dep - qt59base - qt59multimedia - valgrind @@ -39,8 +36,7 @@ matrix: before_install: - eval "${ENV_EVAL}" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then USE_NINJA="-GNinja"; . /opt/qt59/bin/qt59-env.sh; fi -# Switching off temporarily due to broken Valgrind being installed in xenial container. +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then USE_NINJA="-GNinja"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; fi install: -- cgit v1.2.3