summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2015-10-23 02:38:59 +0300
committerOleg Oshmyan <chortos@inbox.lv>2015-10-23 02:47:03 +0300
commite3c899b6614bda68de4c1e7747828744144afeb2 (patch)
tree245972b669cf6e5c0573a368014f2e38c4568f94
parentb4ab3d89805f4dfd5df9a9711fb41f09000a55e6 (diff)
downloadlibass-e3c899b6614bda68de4c1e7747828744144afeb2.tar.bz2
libass-e3c899b6614bda68de4c1e7747828744144afeb2.tar.xz
Fix the Linux build on Travis CI
We need a newer Fontconfig than the default Ubuntu environment provides, so switch to a newer Ubuntu.
-rw-r--r--.travis.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2d93ec3..4283b9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,18 @@ os:
- linux
- osx
+sudo: required
+dist: trusty
+
branches:
only:
- master
- ci
- coverity_scan
-before_install: (sudo apt-get install -y fontconfig libfribidi-dev yasm || brew install fontconfig freetype fribidi yasm) && ./autogen.sh && ./configure
+before_install:
+ - (sudo apt-get update || brew update)
+ - (sudo apt-get install -y fontconfig libfribidi-dev yasm || brew install fontconfig freetype fribidi yasm) && ./autogen.sh && ./configure
script:
- make -j4