Merge pull request #2899 from harfbuzz/ci-fix

[ci] Don’t install meson from its master branch
This commit is contained in:
Khaled Hosny 2021-03-16 10:37:49 +02:00 committed by GitHub
commit 4c34478b28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions

View File

@ -8,14 +8,13 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-18.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install dependencies - name: install dependencies
run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev
- run: sudo pip3 install fonttools - run: sudo pip3 install fonttools meson==0.47.0
- run: sudo pip3 install git+https://github.com/mesonbuild/meson
- name: run - name: run
run: meson build -Db_coverage=true --auto-features=enabled -Dgraphite=enabled -Doptimization=2 run: meson build -Db_coverage=true --auto-features=enabled -Dgraphite=enabled -Doptimization=2
- name: ci - name: ci

View File

@ -2,7 +2,9 @@ name: msvc
on: on:
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ]
jobs: jobs:
msvc: msvc:

View File

@ -2,7 +2,9 @@ name: msys2
on: on:
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ]
jobs: jobs:
msys2: msys2:

View File

@ -36,7 +36,7 @@ test('shape_fuzzer', find_program('run-shape-fuzzer-tests.py'),
args: [ args: [
hb_shape_fuzzer_exe, hb_shape_fuzzer_exe,
], ],
timeout: 60, timeout: 300,
depends: [hb_shape_fuzzer_exe, libharfbuzz, libharfbuzz_subset], depends: [hb_shape_fuzzer_exe, libharfbuzz, libharfbuzz_subset],
workdir: join_paths(meson.current_build_dir(), '..', '..'), workdir: join_paths(meson.current_build_dir(), '..', '..'),
env: env, env: env,