From cd68054706cf9be617965dc03a3877de03685a69 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 12 Feb 2019 12:32:25 +0100 Subject: [PATCH] Travis: only use clang on OSX gcc is an alias for clang --- .travis.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b359f21..e6be459d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,30 @@ # Travis CI configuration file # https://travis-ci.org/collectd/collectd +language: c + env: global: # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - secure: "ZdWWp0XX3C4sLIp4lqeQTWC7vt+GsWjmyRiD17T9833NBAW4dddz310I6iyeXe6oX09ZFFiVIN4ogx9ANcNBx9jriGXI2/82nBhpxOJBebet8JCNS5VeTr4rDSfQOKP+Oc+ko5KbbghTuAtO2CFYiH3jZUcn4TdsYbVanf+TwUs=" -dist: xenial -os: - - linux - - osx -compiler: - - gcc - - clang -language: c -osx_image: xcode10.1 +matrix: + include: + - os: osx + osx_image: xcode10.1 + - os: linux + dist: xenial + compiler: clang + - os: linux + dist: xenial + compiler: gcc + before_install: # When building the coverity_scan branch, allow only the first job to continue to avoid travis-ci/travis-ci#1975. - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" && ! "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then exit 0; fi + before_script: autoreconf -vif + script: - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi - ./configure -- 2.11.0