summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2017-02-06 18:46:22 +0200
committerOleg Oshmyan <chortos@inbox.lv>2017-02-06 18:46:22 +0200
commit488b90d8904ee38c0555508bc1430a29a1663a3c (patch)
tree371ba20e970b56521c82d9eda74fbe7a8a478fa3
parent7efb3b79ef8dd3f6295eac791dc0fc9d602ba7dc (diff)
downloadlibass-488b90d8904ee38c0555508bc1430a29a1663a3c.tar.bz2
libass-488b90d8904ee38c0555508bc1430a29a1663a3c.tar.xz
Travis CI: re-enable Fontconfig on OS X but force no cache built
Building HarfBuzz from source works to avoid Fontconfig, but it is still fairly slow. To further speed up the build, try to use only the prebuilt bottle packages (which inevitably brings in Fontconfig as a dependency) but hack the Fontconfig formula to avoid building the font cache. Adding Fontconfig is not the goal of this commit, as we already have it on Linux and our Fontconfig-related code "should" work equally well on other platforms. But since we can now afford it, explicitly ask Homebrew to install Fontconfig even if the dependency that brings it in disappears from Homebrew in the future, and enjoy the improved code coverage.
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 73e952d..88ef757 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 || brew install freetype fribidi harfbuzz yasm --without-gobject-introspection --without-icu4c) && ./autogen.sh && ./configure
+ - (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
script:
- make -j4