summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2017-02-07 14:14:07 +0200
committerOleg Oshmyan <chortos@inbox.lv>2017-02-07 14:14:07 +0200
commitd83c4bc219bb9358f0ad919aa8837b95d948922e (patch)
tree91c41e098da9584aff830ff194b4fa4ac0353b5a
parent488b90d8904ee38c0555508bc1430a29a1663a3c (diff)
downloadlibass-d83c4bc219bb9358f0ad919aa8837b95d948922e.tar.bz2
libass-d83c4bc219bb9358f0ad919aa8837b95d948922e.tar.xz
Travis CI: remove HarfBuzz and re-remove Fontconfig from OS X builds
Installing HarfBuzz through Homebrew seems to be consistently slow whether we use the bottles and disable the Fontconfig cache or build it from source and drop Fontconfig and other dependencies entirely. To speed up OS X builds, disable both HarfBuzz and Fontconfig. We build with HarfBuzz and Fontconfig on Linux, and we should not have any platform-dependent code that depends on them, so this should not reduce our code coverage.
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 88ef757..45ca101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ branches:
before_install:
- (sudo apt-get update || brew update)
- - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev yasm || (sed -i '' /fc-cache/d "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/fontconfig.rb"; brew install fontconfig freetype fribidi harfbuzz yasm)) && ./autogen.sh && ./configure
+ - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev yasm || brew install freetype fribidi yasm) && ./autogen.sh && ./configure
script:
- make -j4