mirror of
https://github.com/holub/mame
synced 2025-04-15 21:16:28 +03:00
Migrate travis-ci configuration to Ubuntu Bionic
Make sure Qt5 is the default when tools like moc are being called
This commit is contained in:
parent
eb87d9868d
commit
a69a61c49c
16
.travis.yml
16
.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:
|
||||
|
Loading…
Reference in New Issue
Block a user