From 7ca6ed7cad5557107d674303d9d6e63bcf7d2646 Mon Sep 17 00:00:00 2001 From: Jonathan Goldfarb Date: Wed, 10 Oct 2018 22:54:39 -0400 Subject: [PATCH] Turn on OSX build, but allow it to fail for now. Update homebrew package names as much as possible for now --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c48cdd9..16b9900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,6 +77,8 @@ matrix: - os: osx # Until the build passes, then re-enable. before_install: + - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then brew reinstall gettext; fi + - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then brew unlink gettext && brew link gettext --force; fi # Clone and build poppler - git clone ${POPPLER_SOURCE} - cd poppler; @@ -104,8 +106,9 @@ before_install: ./bootstrap; ./configure --disable-programs --disable-python-extension --disable-python-scripting --prefix=${TRAVIS_BUILD_DIR}/usr; make; - make install; - sudo ldconfig + make install + - if [ "${TRAVIS_OS_NAME}" == "linux" ] ; then sudo ldconfig; fi + - if [ "${TRAVIS_OS_NAME}" == "osx" ] ; then sudo update_dyld_shared_cache; fi - cd ${TRAVIS_BUILD_DIR} # Test setup