From a69a61c49cd43f81adbdffab191c9e3b8a81e62f Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 24 Aug 2019 23:39:48 +0200 Subject: Migrate travis-ci configuration to Ubuntu Bionic Make sure Qt5 is the default when tools like moc are being called --- .travis.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc90894ff24..4c7b3a47c9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,11 @@ language: cpp -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - - gcc-5 compiler: - gcc - clang os: - linux - osx -dist: trusty +dist: bionic matrix: exclude: - os: osx @@ -25,18 +18,15 @@ script: - if [ $TRAVIS_OS_NAME == 'linux' ]; then if [ $CC == 'clang' ]; then make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate; - else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; + else make -j4 IGNORE_GIT=1 OPTIMIZE=0 && ./$MAME -validate; fi elif [ $TRAVIS_OS_NAME == 'osx' ]; then unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate; fi sudo: required before_install: - - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; fi" - - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y; fi" - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get update -qq; fi" - - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt55base qt55quickcontrols qt55declarative qt55tools qt55svg; fi" - - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then source /opt/qt55/bin/qt55-env.sh; fi" + - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default; fi" - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew update; fi" - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install sdl2 sdl2_ttf; fi" branches: -- cgit v1.2.3