Hi, On Tue, Sep 25, 2018 at 09:35:38AM +0400, Marc-André Lureau wrote: > Hi > > On Tue, Sep 25, 2018 at 2:19 AM Victor Toso <victortoso@xxxxxxxxxx> wrote: > > > > Hi, > > > > On Tue, Sep 25, 2018 at 01:04:03AM +0400, marcandre.lureau@xxxxxxxxxx wrote: > > > From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > > > > > > 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. > > > > Yep > > > > > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > > > --- > > > .gitlab-ci.yml | 16 +++++++++++----- > > > 1 file changed, 11 insertions(+), 5 deletions(-) > > > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > > index e5e90af..7cd26d3 100644 > > > --- a/.gitlab-ci.yml > > > +++ b/.gitlab-ci.yml > > > @@ -2,11 +2,17 @@ image: fedora:latest > > > > > > 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 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 spice-protocol json-glib-devel > > > > Might be a good moment to move those to a variable such as we do > > in grilo-plugins > > > > https://gitlab.gnome.org/GNOME/grilo-plugins/blob/master/.gitlab-ci.yml > > I don't have a compelling reason to do that, but it's fine to > me. IMHO, it makes the script part nicer to read if we only have short lines of commands. > Do you want me to resend? No need to resend, feel free to push after running a 'local' test to see that all is good with ci. Thanks, > > > > > Cheers, > > Victor > > > > > + - git clone https://gitlab.freedesktop.org/spice/spice-protocol > > > + - (cd spice-protocol && ./autogen.sh --prefix=/usr && make install) > > > > > > makecheck: > > > script: > > > -- > > > 2.19.0 > > > > > > _______________________________________________ > > > Spice-devel mailing list > > > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > > > https://lists.freedesktop.org/mailman/listinfo/spice-devel > > _______________________________________________ > > Spice-devel mailing list > > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/spice-devel > > > > -- > Marc-André Lureau
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel