diff options
| author | wm4 <wm4@nowhere> | 2014-11-24 18:42:15 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-11-24 18:42:27 +0100 |
| commit | 7561adb14da8ce5f2a742eea8506823500167ad5 (patch) | |
| tree | 3a910850c14e15e3cd489ec8be8961a9f16cb83b | |
| parent | 8178f842bf67226549f701cafeaa5eaabaf85221 (diff) | |
| download | mpv-7561adb14da8ce5f2a742eea8506823500167ad5.tar.bz2 mpv-7561adb14da8ce5f2a742eea8506823500167ad5.tar.xz | |
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.)
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
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: |