Edit travis configuration

This commit is contained in:
Daniel Chappuis 2017-07-03 22:23:01 +02:00
parent 04a0efafaf
commit 2f1d529a68

View File

@ -5,25 +5,25 @@ matrix:
include: include:
- os: linux - os: linux
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-4.9 - g++-4.9
env: env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
# OS X / GCC
include:
- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
# OS X / GCC
include:
- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
# Linux / Clang # Linux / Clang
include: include:
- os: linux - os: linux
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
@ -32,14 +32,14 @@ matrix:
- clang-3.6 - clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
# OS X / Clang # OS X / Clang
include: include:
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
before_install: before_install:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
branches: branches:
only: only:
- master - master