add macosx build to travis

This commit is contained in:
derselbst 2017-09-22 20:23:29 +02:00
parent 75e5284f72
commit bd24c2f1f1

View file

@ -90,6 +90,20 @@ matrix:
env: env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
# works on Precise and Trusty
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- cmake-data
- cmake
- libglib2.0-0
env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
# works on Precise and Trusty # works on Precise and Trusty
- os: linux - os: linux
addons: addons:
@ -136,39 +150,47 @@ matrix:
env: env:
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0" - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
## works on Trusty # works on Trusty
#- os: linux - os: linux
#addons: addons:
#apt: apt:
#sources: sources:
#- llvm-toolchain-trusty - llvm-toolchain-trusty-5.0
#- george-edison55-precise-backports - george-edison55-precise-backports
#packages: packages:
#- clang-5.0 - clang-5.0
#- cmake-data - cmake-data
#- cmake - cmake
#- libglib2.0-0 - libglib2.0-0
#env: env:
#- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
#- os: osx - os: osx
#osx_image: xcode8 osx_image: xcode8
#env: env:
#- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
#- os: osx - os: osx
#osx_image: xcode8 osx_image: xcode8
#env: env:
#- MATRIX_EVAL="brew install gcc5 && CC=gcc-5 && CXX=g++-5" - MATRIX_EVAL="brew install gcc5 glib && CC=gcc-5 && CXX=g++-5"
#- os: osx - os: osx
#osx_image: xcode8 osx_image: xcode8
#env: env:
#- MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6" - MATRIX_EVAL="brew install gcc6 glib && CC=gcc-6 && CXX=g++-6"
- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="brew install gcc glib && CC=gcc-7 && CXX=g++-7"
before_install: before_install:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
#install:
#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install glib; fi
before_script: before_script:
- mkdir build && cd build - mkdir build && cd build