From: Oleg Oshmyan Date: Tue, 7 Feb 2017 12:14:07 +0000 (+0200) Subject: Travis CI: remove HarfBuzz and re-remove Fontconfig from OS X builds X-Git-Tag: 0.13.7~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d83c4bc219bb9358f0ad919aa8837b95d948922e;p=libass 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. --- 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