From 31ba9ebea43c7f3a54cafeaf9b369ebaded0c91b Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 7 Oct 2019 16:48:09 +0200 Subject: [PATCH] ci: libfprint master is now version two libfprint master contains version 2 of the library now. This means we need to add dependencies and change some other things a bit. --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6997b7b..e8ebe49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,13 @@ variables: DEPENDENCIES_STABLE: $DEPENDENCIES libfprint-devel DEPENDENCIES_DEV: $DEPENDENCIES git # Sync'ed up with https://gitlab.freedesktop.org/libfprint/libfprint/blob/master/.gitlab-ci.yml - DEPENDENCIES_LIBFPRINT: libusb1-devel glib2-devel nss-devel pixman-devel systemd - meson gtk-doc gcc gcc-c++ glibc-devel libX11-devel - libXv-devel + DEPENDENCIES_LIBFPRINT: libgusb-devel glib2-devel nss-devel pixman-devel systemd meson gtk-doc + gcc gcc-c++ glibc-devel libX11-devel libXv-devel gtk3-devel flatpak-builder + gobject-introspection-devel python3-cairo python3-gobject umockdev build_stable: + # FIXME: Stable builds will fail until libfprintv 2 reaches rawhide + allow_failure: true before_script: - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES_STABLE script: @@ -22,7 +24,7 @@ build_stable: build_dev: before_script: - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES_LIBFPRINT $DEPENDENCIES_DEV - - git clone -b libfprint-1-0 https://gitlab.freedesktop.org/libfprint/libfprint.git + - git clone https://gitlab.freedesktop.org/libfprint/libfprint.git - cd libfprint - meson . _build --prefix=/usr - ninja -C _build