From 7428272f93f025e86b070ad1628d0dbe24a6328a Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Mon, 25 Jun 2018 19:16:42 +0200 Subject: ci: Use custom container for Travis builds Temporary solution. For now, this builds using a container image based on openSUSE Tumbleweed with the current FFmpeg release. More containers will be added (at least with git snapshots of FFmpeg and libass), and Travis will eventually be replaced with something we have more control over. --- .travis.yml | 32 ++++++++++---------------------- ci/build-tumbleweed.sh | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100755 ci/build-tumbleweed.sh 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 diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh new file mode 100755 index 0000000000..46449b0994 --- /dev/null +++ b/ci/build-tumbleweed.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +./bootstrap.py +./waf configure \ + --enable-cdda \ + --enable-dvdread \ + --enable-dvdnav \ + --enable-libmpv-shared \ + --enable-zsh-comp \ + --enable-manpage-build \ + --enable-libarchive \ + --enable-dvbin \ + --enable-vulkan \ + --enable-shaderc +./waf build --verbose -- cgit v1.2.3