matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Use the 'real' gcc on OSX; restore linux which was removed earlier temporarily

Browse Source
This commit is contained in:
Srivats P 2015-12-05 19:37:12 +05:30
parent 8a8242fbda
commit f58372b348
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,7 @@
language: cpp language: cpp
os: os:
- linux
- osx - osx
compiler: compiler:
@ -8,6 +9,7 @@ compiler:
- clang - clang
before_install: before_install:
- "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8; fi"
- "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi" - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
addons: addons: