X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=.travis.yml;h=63f2051cb3f1f22e2529e61ad682c00b3a9a731a;hp=2e9d301641c69dff4626e6f4bb943471015ba7b2;hb=1d0817d56b66797118880358ea7d7a2acfdca429;hpb=1e0b8bf0b3b3b4247fb21e9839af342ae879607c diff --git a/.travis.yml b/.travis.yml index 2e9d301641..63f2051cb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,30 @@ language: c sudo: false +os: + - linux + - osx addons: apt: packages: - - yasm + - nasm - diffutils compiler: - clang - gcc +matrix: + exclude: + - os: osx + compiler: gcc cache: directories: - - libav-samples + - ffmpeg-samples +before_install: + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi +install: + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi script: - - mkdir -p libav-samples - - ./configure --samples=libav-samples --cc=$CC + - mkdir -p ffmpeg-samples + - ./configure --samples=ffmpeg-samples --cc=$CC - make -j 8 - make fate-rsync - make check -j 8