diff options
| author | Ebrahim Byagowi <ebrahim@gnu.org> | 2019-03-28 15:42:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 15:42:45 -0700 |
| commit | a548d1da78b506cc6460fdde3715f6ef13ccad48 (patch) | |
| tree | 9ef34f1d41681137a1ea7d476e7d585a2a42fe64 | |
| parent | 160b4a2b01e925812fbf0e7db5bc9dcb90dc81cc (diff) | |
| download | harfbuzz-a548d1da78b506cc6460fdde3715f6ef13ccad48.tar.gz | |
[ci] Use only CircleCI for macOS (#1637)
| -rw-r--r-- | .circleci/config.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 18 |
2 files changed, 3 insertions, 20 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 54385bba..af5b478b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,8 +27,9 @@ jobs: xcode: "10.2.0" steps: - checkout - - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo - - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo + - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c + - run: brew link --force icu4c + - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext - run: make -j4 - run: make check || .ci/fail.sh diff --git a/.travis.yml b/.travis.yml index 681471dc..703fac25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,16 +45,6 @@ matrix: - make - make check || .ci/fail.sh - - os: osx - compiler: clang - install: - - brew link --force icu4c - script: - - ./autogen.sh - - ./configure $CONFIGURE_OPTS --with-coretext - - make - - make check || .ci/fail.sh - notifications: irc: "irc.freenode.org#harfbuzz" email: harfbuzz-bots-chatter@googlegroups.com @@ -76,14 +66,6 @@ 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: |