From bac8a856f8ce034fde04f024065455c8b29bba5e Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 21 Nov 2020 16:07:57 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"[CI]=20Don=E2=80=99t=20install=20rage?= =?UTF-8?q?l=20on=20circleci=20jobs"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9a9da110a54ea03a0bdd1e64fa9ff7a2b98ba53c. --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75e1fa8d4..811331718 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: xcode: "10.1.0" steps: - checkout - - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo python3 ninja + - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config ragel freetype glib cairo python3 ninja - run: pip3 install meson --upgrade - run: meson build - run: meson compile -Cbuild @@ -28,7 +28,7 @@ jobs: xcode: "11.1.0" steps: - checkout - - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo python3 icu4c graphite2 ninja + - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config ragel freetype glib cairo python3 icu4c graphite2 ninja - run: pip3 install meson --upgrade - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled - run: meson compile -Cbuild @@ -41,7 +41,7 @@ jobs: xcode: "11.4.0" steps: - checkout - - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo python3 icu4c graphite2 gobject-introspection gtk-doc ninja + - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config ragel freetype glib cairo python3 icu4c graphite2 gobject-introspection gtk-doc ninja - run: pip3 install meson --upgrade - 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 @@ -81,7 +81,7 @@ jobs: - image: fedora steps: - checkout - - run: dnf install -y pkg-config valgrind gcc gcc-c++ meson git glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config python python-pip || true + - run: dnf install -y pkg-config ragel valgrind gcc gcc-c++ meson git glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config python python-pip || true - run: meson build --buildtype=debugoptimized - run: ninja -Cbuild -j9 # TOOD: increase timeouts and remove --no-suite=slow @@ -92,7 +92,7 @@ jobs: - image: alpine steps: - checkout - - run: apk update && apk add gcc g++ glib-dev freetype-dev cairo-dev git py3-pip ninja + - run: apk update && apk add ragel gcc g++ glib-dev freetype-dev cairo-dev git py3-pip ninja - run: pip3 install meson==0.47.0 - run: meson build --buildtype=minsize - run: ninja -Cbuild -j9 @@ -103,7 +103,7 @@ jobs: - image: archlinux/base steps: - checkout - - run: pacman --noconfirm -Syu freetype2 meson git clang cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config python python-pip base-devel gtk-doc + - run: pacman --noconfirm -Syu freetype2 meson git clang cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip base-devel gtk-doc - run: pip install flake8 fonttools - run: pip install git+https://github.com/mesonbuild/meson - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics @@ -142,7 +142,7 @@ jobs: executor: win32-executor steps: - checkout - - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y ninja-build binutils gcc g++ pkg-config gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip git g++-mingw-w64-i686 zip + - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y ninja-build binutils gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip git g++-mingw-w64-i686 zip - run: pip3 install meson==0.56.0 --upgrade - run: .ci/build-win32.sh - store_artifacts: