diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d5ca7a0b..31c686a0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,17 +10,6 @@ executors: jobs: - macos-10_12_6-aat-fonts: - macos: - xcode: "9.0.1" - steps: - - checkout - - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo python3 ninja - - run: pip3 install meson --upgrade - - run: meson build - - run: meson compile -Cbuild # or ninja -Cbuild - - run: meson test -Cbuild --print-errorlogs - macos-10_13_6-aat-fonts: macos: xcode: "10.1.0" @@ -31,6 +20,8 @@ jobs: - run: meson build - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs + - store_artifacts: + path: build/meson-logs/ macos-10_14_4-aat-fonts: macos: @@ -42,6 +33,8 @@ jobs: - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs + - store_artifacts: + path: build/meson-logs/ macos-10_15_3-aat-fonts: macos: @@ -53,6 +46,8 @@ jobs: - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs + - store_artifacts: + path: build/meson-logs/ # will be dropped with autotools removal distcheck: @@ -170,7 +165,6 @@ workflows: build: jobs: - - macos-10_12_6-aat-fonts - macos-10_13_6-aat-fonts - macos-10_14_4-aat-fonts - macos-10_15_3-aat-fonts diff --git a/configure.ac b/configure.ac index a3c8a61a0..c8e6d47eb 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AM_PROG_CC_C_O AC_PROG_CXX AX_CXX_COMPILE_STDCXX(11) AC_SYS_LARGEFILE -PKG_PROG_PKG_CONFIG([0.20]) +PKG_PROG_PKG_CONFIG([0.28]) AM_MISSING_PROG([RAGEL], [ragel]) AM_MISSING_PROG([GIT], [git])