From 2425eadfdf2179d5e467ce65924e93f8a19fea60 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 10 Oct 2018 23:29:39 +0200 Subject: [PATCH] .travis.yml: Adding comments to default gcc/clang versions. Unifying call to brew update with removal of custom c++ executable. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f2bdf30..d7ddd892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,11 @@ matrix: env: - MATRIX_EVAL="CC=gcc-6 CXX=g++-6" compiler: gcc - # linux with gcc (default) + # linux with gcc default (4.8) - os: linux dist: trusty compiler: gcc - # linux with clang (default) + # linux with clang default (3.5) - os: linux dist: trusty compiler: clang @@ -89,8 +89,7 @@ matrix: before_install: - eval "${MATRIX_EVAL}" - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo rm /usr/local/include/c++; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && sudo rm /usr/local/include/c++; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi install: