summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2018-06-25 23:24:30 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2018-06-25 23:24:30 +0200
commit802f594a857c703ac88e946d14b69cd3b6eb6006 (patch)
treefc8c528a6532691cefdccaf4dbbaf82d7b182dce
parent7428272f93f025e86b070ad1628d0dbe24a6328a (diff)
downloadmpv-802f594a857c703ac88e946d14b69cd3b6eb6006.tar.bz2
mpv-802f594a857c703ac88e946d14b69cd3b6eb6006.tar.xz
ci: add more build targets
Travis now builds with Clang and containers with git snapshots of some dependencies.
-rw-r--r--.travis.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 0df4c6c760..5073a29eb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,10 @@ sudo: required
env:
matrix:
- - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:latest CI_SCRIPT=ci/build-tumbleweed.sh
+ - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc
+ - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang
+ - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc
+ - CONTAINER=registry.opensuse.org/home/lachs0r/images/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang
global:
# Coverity token
- secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
@@ -26,7 +29,7 @@ branches:
before_install:
- docker pull $CONTAINER
script:
- - docker run -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT"
+ - docker run --env CC -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