[Spice-devel] [PATCH spice-gtk v2] gitabl-ci: fix CI build
marcandre.lureau at redhat.com
marcandre.lureau at redhat.com
Tue Sep 25 08:35:58 UTC 2018
From: Marc-André Lureau <marcandre.lureau at redhat.com>
I broke gitlab CI in commit f61534d by introducing json-glib
dependency. Instead of depending on dnf builddep, list the build
dependencies explicitly.
Remove copr usage, that fails from time to time. Install
spice-protocol from git.
Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
v2:
- use a DEPS variable
- remove spice-protocol from DEPS list
- clone relative spice-protocol git repository
.gitlab-ci.yml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5e90af..706ea9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,20 @@
image: fedora:latest
+variables:
+ DEPS: git libtool make python3 python3-six redhat-rpm-config
+ python3-pyparsing meson ninja-build zlib-devel openssl-devel
+ intltool gtk3-devel gtk-doc gobject-introspection-devel
+ cyrus-sasl-devel pulseaudio-libs-devel libjpeg-turbo-devel
+ libacl-devel gstreamer1-devel gstreamer1-plugins-base-devel
+ polkit-devel vala lz4-devel opus-devel libgudev-devel
+ pixman-devel libcacard-devel celt051-devel libphodav-devel
+ usbutils usbredir-devel libusbx-devel libsoup-devel
+ json-glib-devel
+
before_script:
- - >
- dnf install 'dnf-command(copr)' git libtool make redhat-rpm-config
- python3 python3-six python3-pyparsing meson ninja-build
- -y
- - dnf copr enable @spice/nightly -y
- - dnf builddep spice-gtk -y
+ - dnf install -y $DEPS
+ - git clone ${CI_REPOSITORY_URL/spice-gtk/spice-protocol}
+ - (cd spice-protocol && ./autogen.sh --prefix=/usr && make install)
makecheck:
script:
--
2.19.0
More information about the Spice-devel
mailing list