CI: Use the 'real' gcc on OSX; restore linux which was removed earlier temporarily
This commit is contained in:
parent
8a8242fbda
commit
f58372b348
@ -1,6 +1,7 @@
|
||||
language: cpp
|
||||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
|
||||
compiler:
|
||||
@ -8,6 +9,7 @@ compiler:
|
||||
- clang
|
||||
|
||||
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"
|
||||
|
||||
addons:
|
||||
|
Loading…
Reference in New Issue
Block a user