[ci] Simplify and fix Travis CI macOS build
This commit is contained in:
parent
628d457c87
commit
b150bb4a49
16
.travis.yml
16
.travis.yml
|
@ -46,13 +46,7 @@ matrix:
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang
|
compiler: clang
|
||||||
install:
|
install:
|
||||||
- brew update;
|
- brew link --force icu4c
|
||||||
# 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"
|
|
||||||
script:
|
script:
|
||||||
- ./autogen.sh
|
- ./autogen.sh
|
||||||
- ./configure $CONFIGURE_OPTS --with-coretext
|
- ./configure $CONFIGURE_OPTS --with-coretext
|
||||||
|
@ -76,6 +70,14 @@ addons:
|
||||||
- libicu-dev # for extra unicode functions
|
- libicu-dev # for extra unicode functions
|
||||||
- libgraphite2-dev # for extra shapers
|
- libgraphite2-dev # for extra shapers
|
||||||
#- libgirepository1.0-dev # for gobject-introspection
|
#- libgirepository1.0-dev # for gobject-introspection
|
||||||
|
homebrew:
|
||||||
|
packages:
|
||||||
|
- cairo
|
||||||
|
- freetype
|
||||||
|
- glib
|
||||||
|
- graphite2
|
||||||
|
- icu4c
|
||||||
|
#- gobject-introspection
|
||||||
|
|
||||||
coverity_scan:
|
coverity_scan:
|
||||||
project:
|
project:
|
||||||
|
|
Loading…
Reference in New Issue