From b8d80fcb35a5b1028ce0deb18884b04bc750fd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 6 Feb 2020 22:03:53 +0100 Subject: [PATCH] ci: Include libfprint templates to sync with its dependencies Use libfprint templates in order to get its dependencies without having to manually keep a list of them in sync --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dc0fa1..388a57c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,20 @@ image: fedora:rawhide +include: + - project: 'libfprint/libfprint' + ref: master + file: '/.gitlab-ci/libfprint-templates.yaml' + variables: DEPENDENCIES: dbus-glib-devel pam-devel polkit-devel gtk-doc meson gettext gcovr gcc gcc-c++ glibc-devel python3-dbusmock python3-libpamtest systemd-devel DEPENDENCIES_STABLE: $DEPENDENCIES libfprint-devel DEPENDENCIES_DEV: $DEPENDENCIES git - # Sync'ed up with https://gitlab.freedesktop.org/libfprint/libfprint/blob/master/.gitlab-ci.yml - # and stripped down to remove dependencies that are not strictly needed - DEPENDENCIES_LIBFPRINT: libgusb-devel glib2-devel meson - gcc gcc-c++ glibc-devel - gobject-introspection-devel python3-cairo python3-gobject .install_libfprint_dev: &install_libfprint_dev before_script: - - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES_LIBFPRINT $DEPENDENCIES_DEV + - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $LIBFPRINT_DEPENDENCIES $DEPENDENCIES_DEV - git clone https://gitlab.freedesktop.org/libfprint/libfprint.git - cd libfprint - meson . _build --prefix=/usr -Ddrivers=virtual_image -Ddoc=false