summary refs log tree commit diff
diff options
context:
space:
mode:
authorredsky17 <joedonofry@gmail.com>2019-02-04 02:03:07 +0000
committerredsky17 <joedonofry@gmail.com>2019-02-04 02:03:07 +0000
commitda968bbaa89b6b1f6cc9469e3342073c7dea6b65 (patch)
tree8cddfeb20dfd98ab01fa5398b360a1c3a65712af
parentUpdate travis mac deploy (diff)
downloadnheko-da968bbaa89b6b1f6cc9469e3342073c7dea6b65.tar.xz
Try to force link of icu4c in mac build
-rwxr-xr-x.ci/install.sh4
-rw-r--r--.travis.yml4
2 files changed, 3 insertions, 5 deletions
diff --git a/.ci/install.sh b/.ci/install.sh

index b0063c06..1a7079f6 100755 --- a/.ci/install.sh +++ b/.ci/install.sh
@@ -4,8 +4,10 @@ set -ex if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update - brew install qt5 lmdb clang-format ninja libsodium cmark + brew install icu4c qt5 lmdb clang-format ninja libsodium cmark brew upgrade boost cmake || true + # Attempt to fix icu4c issues. + brew unlink icu4c && brew link icu4c --force curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py sudo python get-pip.py diff --git a/.travis.yml b/.travis.yml
index ce510a60..36ea9821 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -19,10 +19,6 @@ matrix: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=0 - USE_BUNDLED_CMARK=0 - addons: - homebrew: - packages: - - qt5 - os: linux compiler: gcc env: