summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml32
1 files changed, 10 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index b7881a1ad7..0df4c6c760 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,20 @@ language: c
os:
- linux
- #- osx
+
+services:
+ - docker
+
+sudo: required
+
env:
matrix:
- - LIBAV=ffmpeg-git
- - LIBAV=libav-git
+ - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:latest CI_SCRIPT=ci/build-tumbleweed.sh
global:
# Coverity token
- secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
# Travis token for mpv.io
- secure: "nlTVLJK6kRhtXvhKCoJ3YdFGHuKaq/eHowfPw25hqRWuBOZd+HjHY5KIYjV7SxuKFDpJE4GpNcvA3Q31nsqomxpkLYgrwjg6TSazN7ZP+x85ZgV1QGFebrPfGm2n5UR5CAPAwFoeF3pZheLi4bajVzwq1fWW+x3grS188P9OZso="
-compiler:
- - clang
- - gcc
branches:
only:
@@ -22,23 +23,10 @@ branches:
- ci
- coverity_scan
-matrix:
- exclude:
- - os: osx
- env: LIBAV=libav-git
- - os: osx
- env: LIBAV=ffmpeg-git
- - os: osx
- compiler: gcc
- - os: linux
- compiler: clang
- - env: LIBAV=libav-git
-
-before_install: TOOLS/travis-deps libass-stable $LIBAV
+before_install:
+ - docker pull $CONTAINER
script:
- - ./bootstrap.py
- - ./waf configure
- - ./waf build
+ - docker run -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT"
after_failure: cat ./build/config.log
after_script: TOOLS/travis-rebuild-website