Add OSX build to Travis matrix

Also allow the Linux build to fail, for now
This commit is contained in:
2016-11-05 23:37:53 -04:00
parent d93dae9096
commit 5a4382bb7b
2 changed files with 22 additions and 4 deletions

8
.travis-install-deps.sh Executable file
View File

@@ -0,0 +1,8 @@
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
brew install scons sfml boost
else
sudo apt-get update -qq
sudo apt-get install -qq libsfml-dev libboost-dev
fi

View File

@@ -6,12 +6,22 @@ script: scons
compiler:
- clang
sudo: required
dist: trusty
os:
- linux
- osx
matrix:
allow_failures:
- os: linux
include:
- os: linux
sudo: required
dist: trusty
- os: osx
osx_image: xcode7.2
install:
- sudo apt-get update -qq
- sudo apt-get install -qq libsfml-dev libboost-dev
- ./.travis-install-deps.sh
branches:
except: