diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-03-17 16:35:17 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-03-17 17:41:35 +0100 |
| commit | dbd81bbb89ae91334fb2e608e6860ed0055d1915 (patch) | |
| tree | 810511bae3e3f95b3a9db73cebbcf31644a907c7 /.gitlab-ci.yml | |
| parent | 3f8f6826ac012f82a7c80beccc0240eac053f403 (diff) | |
| download | slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.zip slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.tar.gz slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.tar.bz2 | |
Teach slirp_version_string() to return vcs version
Meson build will use a vcs-generate version, while Makefile will
always use -git version, since it is only intended for submodule
usage. Eventually can be improved if needed.
Fixes:
https://gitlab.freedesktop.org/slirp/libslirp/issues/17
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8ef14b..a15ae3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,11 @@ variables: DEPS: meson ninja-build make gcc pkg-config glib2-devel mingw64-gcc mingw64-pkg-config mingw64-glib2 - clang-analyzer + clang-analyzer git-core before_script: - dnf install -y $DEPS + - git describe build: script: |