ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Travis: Fix newer Qt moc

This commit is contained in:
Vicki Pfau 2019-10-14 19:53:39 -07:00
parent 7fe88430cf
commit f3496042af
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis-deps.sh
View File

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
set -e
if [ $TRAVIS_OS_NAME = "osx" ]; then if [ $TRAVIS_OS_NAME = "osx" ]; then
brew update brew update
brew install qt5 ffmpeg imagemagick sdl2 libedit libelf libpng libzip brew install qt5 ffmpeg imagemagick sdl2 libedit libelf libpng libzip
else
sudo apt-get update
sudo apt-get -y install libseccomp2
fi fi

2
.travis.yml
View File

@ -24,7 +24,7 @@ matrix:
before_install: before_install:
- '[ -z "$DOCKER_TAG" ] || docker pull mgba/$DOCKER_TAG' - '[ -z "$DOCKER_TAG" ] || docker pull mgba/$DOCKER_TAG'
- '[ "$TRAVIS_OS_NAME" != "osx" ] || . ./.travis-deps.sh' - '. ./.travis-deps.sh'
- 'mkdir build && chmod 777 build' - 'mkdir build && chmod 777 build'
script: script: