diff --git a/.travis.yml b/.travis.yml index 7ca7d5b99..3d5c30ac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,10 +93,13 @@ matrix: language: generic env: SWBASE=/Users/Shared/buildbot/sw SW=$SWBASE/sw PATH=$SW/bin:$PATH - # Disabled because harfbuzz is currently broken in brew - # - os: osx - # language: generic - # env: USE_BREW=1 BUILD_PKG=osx-bundle + - os: osx + language: generic + addons: + homebrew: + update: true + brewfile: true + env: USE_BREW=1 BUILD_PKG=osx-bundle env: global: @@ -110,12 +113,6 @@ install: | if [[ "$RUN_FLAKE" == "1" ]]; then pip install flake8; fi if [[ "$TRAVIS_OS_NAME" == 'osx' ]]; then if [[ "$USE_BREW" == "1" ]]; then - brew update; - # brew upgrade python; - brew install harfbuzz --without-graphite2 --without-icu4c --without-freetype; - brew install imagemagick - brew install optipng - brew install librsvg logo/make.py else mkdir -p $SW; diff --git a/Brewfile b/Brewfile new file mode 100644 index 000000000..0fefc9bf3 --- /dev/null +++ b/Brewfile @@ -0,0 +1,5 @@ +brew 'imagemagick' +brew 'optipng' +brew 'librsvg' +brew 'harfbuzz' +brew 'python'