summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-21 02:33:50 +0100
committerwm4 <wm4@nowhere>2014-11-21 02:34:01 +0100
commit78fe4f1bd4f5fc1b41aa977724f5e41df4a58e23 (patch)
tree12c08ba9e3d8cd2b03b6f55ef8baaec386dbd7bf /.travis.yml
parentcd42d72a7f39fe3a5c336f738133617c743f407d (diff)
downloadmpv-78fe4f1bd4f5fc1b41aa977724f5e41df4a58e23.tar.bz2
mpv-78fe4f1bd4f5fc1b41aa977724f5e41df4a58e23.tar.xz
travis: another attempt (2)
They said YAML is "simple"...
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index ccf4d6feba..c3607d56a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,13 @@ os:
- linux
- osx
env:
- - LIBAV=libav-stable
- - LIBAV=libav-git
- - LIBAV=ffmpeg-stable
- - LIBAV=ffmpeg-git
+ matrix:
+ - LIBAV=libav-stable
+ - LIBAV=libav-git
+ - LIBAV=ffmpeg-stable
+ - LIBAV=ffmpeg-git
global:
- - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
+ - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
compiler:
- clang