From 7eb10178b87d557d024ad47ee1edb08aa6a3f9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 5 Feb 2020 18:04:00 +0100
Subject: [PATCH] ci: Use a template to define libfprint dependencies

This allows to share the configuration with fprintd
---
 .gitlab-ci.yml                      | 27 ++-------------------------
 .gitlab-ci/libfprint-templates.yaml | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 .gitlab-ci/libfprint-templates.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 270aec2..7edb83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ variables:
   LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
 
 include:
+  - local: '.gitlab-ci/libfprint-templates.yaml'
   - project: 'wayland/ci-templates'
     ref: master
     file: '/templates/fedora.yml'
@@ -140,28 +141,4 @@ container_fedora_build:
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     # a list of packages to install
-    FEDORA_RPMS:
-      doxygen
-      flatpak-builder
-      gcc
-      gcc-c++
-      gcovr
-      git
-      glib2-devel
-      glibc-devel
-      gobject-introspection-devel
-      gtk-doc
-      gtk3-devel
-      libabigail
-      libgusb-devel
-      libX11-devel
-      libXv-devel
-      meson
-      nss-devel
-      pixman-devel
-      python3-cairo
-      python3-gobject
-      systemd
-      umockdev
-      uncrustify
-      valgrind
+    FEDORA_RPMS: $LIBFPRINT_DEPENDENCIES
diff --git a/.gitlab-ci/libfprint-templates.yaml b/.gitlab-ci/libfprint-templates.yaml
new file mode 100644
index 0000000..a1baa0a
--- /dev/null
+++ b/.gitlab-ci/libfprint-templates.yaml
@@ -0,0 +1,26 @@
+variables:
+  LIBFPRINT_DEPENDENCIES:
+      doxygen
+      flatpak-builder
+      gcc
+      gcc-c++
+      gcovr
+      git
+      glib2-devel
+      glibc-devel
+      gobject-introspection-devel
+      gtk-doc
+      gtk3-devel
+      libabigail
+      libgusb-devel
+      libX11-devel
+      libXv-devel
+      meson
+      nss-devel
+      pixman-devel
+      python3-cairo
+      python3-gobject
+      systemd
+      umockdev
+      uncrustify
+      valgrind