Skip to content

Commit

Permalink
travis: use Mac OS 10.14 and Xcode 10.2.1
Browse files Browse the repository at this point in the history
The default Mac OS environment on travis no longer has brew bottle
support, so jobs time out.

Add the `osx_image` key to specify Mac OS 10.14 and Xcode 10.2.1.

Also try to re-enable link support using SFML.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
  • Loading branch information
rkitover committed May 29, 2019
1 parent b0ec846 commit 3490620
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -66,12 +66,13 @@ matrix:
- env: BUILD_ENV=mac
language: cpp
os: osx
osx_image: xcode10.2
before_script:
- ./installdeps
script:
- mkdir build
- cd build
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON -DENABLE_LINK=OFF
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON -DENABLE_LINK=ON
- make -j2
- ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
cache:
Expand Down
4 changes: 2 additions & 2 deletions installdeps
Expand Up @@ -1054,9 +1054,9 @@ brew_installdeps() {
brews="nasm cmake ccache ffmpeg gettext libpng pkg-config sdl2 wxmac ccache"

# sfml brew currently broken in the travis mac environment
if [ -z "$TRAVIS" ]; then
# if [ -z "$TRAVIS" ]; then
brews="$brews sfml"
fi
# fi

set --
for f in $brews; do
Expand Down

0 comments on commit 3490620

Please sign in to comment.