Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:12:24 +0000 (17:12 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:12:24 +0000 (17:12 +0000)
* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
  travis: Enable OSX integration

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
.travis.yml

diff --cc .travis.yml
@@@ -10,10 -13,14 +13,14 @@@ 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 yasm; 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