[Spice-devel] [PATCH spice-gtk] gitabl-ci: fix CI build

[Marc-André Lureau]

Hi

On Tue, Sep 25, 2018 at 12:18 PM Frediano Ziglio <fziglio at redhat.com> wrote:
>
> >
> > 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>
> > ---
> >  .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
> > +  - git clone https://gitlab.freedesktop.org/spice/spice-protocol
> > +  - (cd spice-protocol && ./autogen.sh --prefix=/usr && make install)
> >
>
> Why do you install spice-protocol twice (from package and manually) ?

overlooked (I c&p the list from builddep), fixed

>
> Is there a way to use a "relative" url in git clone? Maybe using
> CI_REPOSITORY_URL variable? Like (didn't test, bash)
>
>    got clone ${CI_REPOSITORY_URL//spice-gtk/spice-protocol}

interesting idea, adopted

thanks

>
> >  makecheck:
> >    script:
>
> Frediano
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel



-- 
Marc-André Lureau