diff options
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rwxr-xr-x | travis-deps | 11 |
2 files changed, 24 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index faafe27b86..c588d0562d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: c +os: + - linux + - osx env: - LIBAV=libav-stable - LIBAV=libav-git @@ -7,24 +10,31 @@ env: - LIBAV=ffmpeg-git compiler: - clang + branches: only: - master - ci +matrix: + exclude: + - os: osx + env: LIBAV=libav-stable + - os: osx + env: LIBAV=libav-git + - os: osx + env: LIBAV=ffmpeg-git + before_install: ./travis-deps libass-stable $LIBAV script: - ./bootstrap.py - ./waf configure - ./waf build -notifications-policy: ¬ifications-policy - on_success: change - on_failure: always - notifications: email: false irc: channels: - "irc.freenode.org#mpv-player-dev" - <<: *notifications-policy + on_success: change + on_failure: always diff --git a/travis-deps b/travis-deps index f43a78d55e..adf7fadefa 100755 --- a/travis-deps +++ b/travis-deps @@ -89,8 +89,15 @@ end class Dependencies < TravisDepsBuilder def deps - sh "sudo apt-get update -y" - sh "sudo apt-get install pkg-config fontconfig libfribidi-dev yasm -y" + case ENV['TRAVIS_OS_NAME'] + when 'linux' then + sh "sudo apt-get update -y" + sh "sudo apt-get install pkg-config fontconfig libfribidi-dev yasm -y" + when 'osx' then + sh 'brew install pkg-config fontconfig freetype fribidi yasm' + else + abort "Unrecognized OS" + end end end |