From 93709c019624acc6b079bf2a70c18b8340c9129d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 5 May 2022 12:10:09 +0100 Subject: github: switch workflows over to using meson MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This switch the pull request and coverity workflows over to use Meson instead of cmake. Signed-off-by: Daniel P. Berrangé --- .github/workflows/coverity.yml | 4 ++-- .github/workflows/pull_request.yml | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to '.github') diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index ab33388..b383317 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -14,8 +14,8 @@ jobs: run: | sudo apt-get update sudo apt-get -y install libjson-c-dev libcmocka-dev clang valgrind \ - python3-pytest debianutils - make coverity VERBOSE=1 + python3-pytest debianutils meson ninja-build + ./.github/workflows/coverity.sh env: COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }} COVERITY_EMAIL: ${{ secrets.COVERITY_EMAIL }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a970009..ab1594d 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -10,8 +10,9 @@ jobs: run: | sudo apt-get update sudo apt-get -y install libjson-c-dev libcmocka-dev clang valgrind \ - python3-pytest debianutils flake8 - make pre-push VERBOSE=1 + python3-pytest debianutils flake8 meson \ + ninja-build + ./.github/workflows/pull_request.sh centos-7: timeout-minutes: 10 runs-on: ubuntu-latest @@ -22,9 +23,9 @@ jobs: run: | # NB: no working flake8 yum -y install make gcc-4.8.5 epel-release pciutils - yum -y install clang cmake json-c-devel libcmocka-devel \ - valgrind python36-pytest which - make pre-push VERBOSE=1 + yum -y install clang json-c-devel libcmocka-devel \ + valgrind python36-pytest which ninja-build meson + ./.github/workflows/pull_request.sh fedora-35: timeout-minutes: 10 runs-on: ubuntu-latest @@ -34,6 +35,6 @@ jobs: - name: pre-push run: | dnf -y install --releasever=35 \ - gcc make clang cmake json-c-devel libcmocka-devel pciutils \ - diffutils valgrind python3-pytest python3-flake8 which - make pre-push VERBOSE=1 + gcc make clang json-c-devel libcmocka-devel pciutils diffutils \ + valgrind python3-pytest python3-flake8 which meson ninja-build + ./.github/workflows/pull_request.sh -- cgit v1.1