From 36207d972664ac5969dc984021d7ecc8f1132bc0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 16 Feb 2018 23:39:16 +0100 Subject: [PATCH] .travis.yml: add variable MATRIX_EVAL --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c61d6a50..511f2f392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,20 @@ matrix: - g++-5 - libcppunit-dev - libboost-dev + env: + - MATRIX_EVAL="export CC=gcc-5 CXX=g++-5" - os: osx osx_image: xcode9.3beta + env: + - MATRIX_EVAL="" env: global: - MAKEFLAGS="-j2" before_install: + - eval "${MATRIX_EVAL}" # C++14 - test "$TRAVIS_OS_NAME" != "osx" || brew update @@ -30,7 +35,6 @@ install: script: - OPTIONS="--enable-test" - - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5 - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx" - ./autogen.sh - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS