From cdd79a09351dcf9e43447b5d0df7a3a06cfb7cfe Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 3 Dec 2019 16:46:11 +0100 Subject: [PATCH] ci: Remove libfprint dependencies that are not needed The dependency list of libfprint used to be a direct copy of the libfprint CI list. However, many of the dependencies are not needed as only a minimal version of libfprint is built for testing purposes. --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53686d0..bea01c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,10 @@ 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: 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 + # 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 build_stable: # FIXME: Stable builds will fail until libfprintv 2 reaches rawhide @@ -26,7 +27,7 @@ build_dev: - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES_LIBFPRINT $DEPENDENCIES_DEV - git clone https://gitlab.freedesktop.org/libfprint/libfprint.git - cd libfprint - - meson . _build --prefix=/usr + - meson . _build --prefix=/usr -Ddrivers=virtual_image -Ddoc=false - ninja -C _build - ninja -C _build install - cd .. @@ -43,7 +44,7 @@ test_dev: - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES_LIBFPRINT $DEPENDENCIES_DEV - git clone https://gitlab.freedesktop.org/libfprint/libfprint.git - cd libfprint - - meson . _build --prefix=/usr -Ddrivers=virtual_image + - meson . _build --prefix=/usr -Ddrivers=virtual_image -Ddoc=false - ninja -C _build - ninja -C _build install - cd ..