diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-05-05 12:10:09 +0100 |
|---|---|---|
| committer | John Levon <levon@movementarian.org> | 2022-05-09 23:28:10 +0100 |
| commit | 93709c019624acc6b079bf2a70c18b8340c9129d (patch) | |
| tree | 6e60a8940a79387d45609023509f2af9e1fe7cd8 | |
| parent | f75110385495b8b580121e14afa5dfc9681a64a3 (diff) | |
| download | libvfio-user-93709c019624acc6b079bf2a70c18b8340c9129d.zip libvfio-user-93709c019624acc6b079bf2a70c18b8340c9129d.tar.gz libvfio-user-93709c019624acc6b079bf2a70c18b8340c9129d.tar.bz2 | |
github: switch workflows over to using meson
This switch the pull request and coverity workflows over to use Meson
instead of cmake.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | .github/workflows/coverity.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/pull_request.yml | 17 | ||||
| -rw-r--r-- | Makefile | 24 |
3 files changed, 16 insertions, 29 deletions
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 @@ -126,25 +126,11 @@ test: all pytest endif cd $(BUILD_DIR)/test; ctest --verbose -pre-push: realclean - $(RSTLINT) docs/vfio-user.rst - $(FLAKE8) --extend-ignore=F405,F403,E128,E131,E127 $$(find . -name '*.py') - make test WITH_ASAN=1 WITH_TRAN_PIPE=1 - make realclean - make test CC=clang BUILD_TYPE=rel WITH_TRAN_PIPE=1 - make test CC=clang WITH_TRAN_PIPE=1 - make realclean - make test CC=gcc BUILD_TYPE=rel WITH_TRAN_PIPE=1 - make test CC=gcc WITH_TRAN_PIPE=1 - make pytest-valgrind - make install DESTDIR=tmp.install - -coverity: realclean - curl -sS -L -o coverity.tar.gz -d "token=$$COVERITY_TOKEN&project=nutanix%2Flibvfio-user" https://scan.coverity.com/download/cxx/linux64 - tar xf coverity.tar.gz - ./cov-analysis-linux64-*/bin/cov-build --dir cov-int make -j4 all - tar czf coverity-results.tar.gz cov-int - curl --form token=$$COVERITY_TOKEN --form email=$$COVERITY_EMAIL --form file=@coverity-results.tar.gz --form version="$(GIT_SHA)" https://scan.coverity.com/builds?project=nutanix%2Flibvfio-user +pre-push: + .github/workflows/pull_request.sh + +coverity: + .github/workflows/coverity.sh GCOVS=$(patsubst %.c,%.c.gcov, $(wildcard lib/*.c)) |