From 7360265e69a8cdaa9f993c36def2860a79cca49f Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 28 Mar 2019 16:57:56 -0700 Subject: [PATCH] [ci] Tweak macos and psvita bots (#1638) * Add --with-graphite2 to macOS * Add a dummy ragel script for psvita --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af5b478..2cf473a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,9 +27,8 @@ 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 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: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c graphite2 + - 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 --with-graphite2 - run: make -j4 - run: make check || .ci/fail.sh @@ -263,6 +262,7 @@ jobs: steps: - checkout - run: git clone https://github.com/vitasdk/vdpm && cd vdpm && ./bootstrap-vitasdk.sh + - run: echo "#""!""/bin/true" > /usr/bin/ragel && chmod +x /usr/bin/ragel - run: ./autogen.sh --prefix=/usr/local/vitasdk/arm-vita-eabi --host=arm-vita-eabi - run: make -j32 -- 2.7.4