[ci] Install newer meson from pip

This commit is contained in:
Ebrahim Byagowi 2020-05-21 17:41:45 +04:30
parent f7562672f9
commit 99e2342a6b
2 changed files with 6 additions and 6 deletions

View File

@ -48,8 +48,8 @@ jobs:
- image: ubuntu:19.10 - image: ubuntu:19.10
steps: steps:
- checkout - checkout
- run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip meson cmake - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip cmake
- run: pip install fonttools - run: pip3 install fonttools meson --upgrade
- run: ./autogen.sh - run: ./autogen.sh
- run: make -j32 - run: make -j32
- run: make distcheck || .ci/fail.sh - run: make distcheck || .ci/fail.sh
@ -227,8 +227,8 @@ jobs:
- image: ubuntu:19.10 - image: ubuntu:19.10
steps: steps:
- checkout - checkout
- run: apt update && apt install -y ninja-build binutils meson gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - run: apt update && apt install -y ninja-build binutils meson gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
- run: pip install fonttools - run: pip3 install fonttools meson --upgrade
- run: meson build && ninja -Cbuild test && rm -rf build - run: meson build && ninja -Cbuild test && rm -rf build
# test amalgam build # test amalgam build
- run: meson build -Damalgam=true && ninja -Cbuild && rm -rf build - run: meson build -Damalgam=true && ninja -Cbuild && rm -rf build

View File

@ -33,8 +33,8 @@ environment:
install: install:
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{gcc,freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python3,python3-pip,ragel,meson,ninja}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{gcc,freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python3,python3-pip,ragel,ninja}"'
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pip install fonttools"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pip install fonttools meson"'
build_script: build_script:
- set "PYTHON_ROOT=C:\python37-x64" - set "PYTHON_ROOT=C:\python37-x64"