diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-27 17:53:50 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-27 18:04:04 +0400 |
| commit | c0eac03e8ce1b9a743231f2fe21e7cb579fc9339 (patch) | |
| tree | b5e30c908f8559ee04a793b312855b742939a68d /.gitlab-ci.yml | |
| parent | d61b5d71fbb4259989f830692d15a6367ce94261 (diff) | |
| download | slirp-c0eac03e8ce1b9a743231f2fe21e7cb579fc9339.zip slirp-c0eac03e8ce1b9a743231f2fe21e7cb579fc9339.tar.gz slirp-c0eac03e8ce1b9a743231f2fe21e7cb579fc9339.tar.bz2 | |
Remove the QEMU-special make build-system
Since QEMU 5.2, QEMU uses meson and handle the build itelf before it
starts using libslirp as a subproject.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0521944..46e58a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,14 @@ image: fedora:latest variables: - DEPS: meson ninja-build make + DEPS: meson ninja-build gcc pkg-config glib2-devel mingw64-gcc mingw64-pkg-config mingw64-glib2 clang-analyzer git-core before_script: - dnf install -y $DEPS + - git fetch --tags https://gitlab.freedesktop.org/slirp/libslirp.git - git describe build: @@ -22,10 +23,6 @@ build-mingw64: - (mkdir buildw && cd buildw && mingw64-meson --werror) || (cat buildw/meson-logs/meson-log.txt && exit 1) - ninja -C buildw -build-qemu: - script: - - make BUILD_DIR=build - Coverity: only: refs: @@ -33,11 +30,12 @@ Coverity: - coverity script: - dnf update -y - - dnf install -y make curl clang + - dnf install -y curl clang - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN - tar xfz /tmp/cov-analysis-linux64.tgz - - cov-analysis-linux64-*/bin/cov-build --dir cov-int make -j4 CC=clang + - CC=clang meson build + - cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C build - tar cfz cov-int.tar.gz cov-int - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL |