From 12eab2a346ad741731aa3dfa396e51cb1f8df1e3 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 25 Aug 2019 01:05:29 +0200 Subject: [PATCH] Migrate travis-ci to gcc-9 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c7b3a47c9f..b2ee70b0e1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,15 +18,16 @@ 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 && ./$MAME -validate; + else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-9" OVERRIDE_CXX="g++-9" && ./$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:ubuntu-toolchain-r/test -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 qt5-default; fi" + - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes gcc-9 g++-9 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: