From 7561adb14da8ce5f2a742eea8506823500167ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 24 Nov 2014 18:42:15 +0100 Subject: travis: restrict build matrix further We don't actually want to test all possible combinations; we just want to make sure that each thing (e.g. linux/osx, ffmpeg/libav) is tested once. Exclude Linux + ffmpeg-stable, because ffmpeg-stable is already tested on OSX. Exclude clang on Linux, because OSX needs clang, but Coverity (running on Linux) needs gcc - so we use gcc only on Linux. I also wanted to reduce the matrix to a single configuration when running Coverity, but apparently this is not possible. (See travis-ci/travis-ci#1975.) --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 296da01536..dab4b6d631 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,10 @@ matrix: env: LIBAV=ffmpeg-git - os: osx compiler: gcc + - os: linux + env: LIBAV=ffmpeg-stable + - os: linux + compiler: clang before_install: ./travis-deps libass-stable $LIBAV script: -- cgit v1.2.3