summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2019-03-13 13:21:12 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2019-03-13 14:59:43 +0200
commit8b1eaecd9485fe504af364db1537bb04852b265c (patch)
treeda6f9d356b53bc7f3f095724eed40d8062655388
parente52ec3fc23c2d5a881849f047885e0423bd74740 (diff)
[ci] Simplify and fix Travis CI macOS build
-rw-r--r--.travis.yml16
1 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index afb1b1ae..88967ddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,13 +46,7 @@ matrix:
- os: osx
compiler: clang
install:
- - brew update;
- # Workaround Travis/brew bug
- - brew uninstall libtool && brew install libtool
- - brew install ragel freetype glib gobject-introspection cairo graphite2 || true
- - brew upgrade icu4c || true
- - export PATH="/usr/local/opt/icu4c/sbin:/usr/local/opt/icu4c/bin:$PATH"
- - export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
+ - brew link --force icu4c
script:
- ./autogen.sh
- ./configure $CONFIGURE_OPTS --with-coretext
@@ -76,6 +70,14 @@ addons:
- libicu-dev # for extra unicode functions
- libgraphite2-dev # for extra shapers
#- libgirepository1.0-dev # for gobject-introspection
+ homebrew:
+ packages:
+ - cairo
+ - freetype
+ - glib
+ - graphite2
+ - icu4c
+ #- gobject-introspection
coverity_scan:
project: