From 1a094c1a092c281cd03ac967c1c8170116dd2537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 24 Jan 2020 16:36:03 +0100
Subject: [PATCH] ci: Use a template to avoid repeating the libfprint-dev
 installation

---
 .gitlab-ci.yml | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80e1ca0..c52eeaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,18 @@ variables:
                           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
+    - git clone https://gitlab.freedesktop.org/libfprint/libfprint.git
+    - cd libfprint
+    - meson . _build --prefix=/usr -Ddrivers=virtual_image -Ddoc=false
+    - ninja -C _build
+    - ninja -C _build install
+    - cd ..
+    # So we don't get error about this libfprint file
+    - echo "libfprint/demo/gtk-libfprint-test.ui" >> po/POTFILES.skip
+
 build_stable:
   # FIXME: Stable builds will fail until libfprintv 2 reaches rawhide
   allow_failure: true
@@ -23,16 +35,7 @@ build_stable:
     - make install
 
 build_dev:
-  before_script:
-    - 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 -Ddoc=false
-    - ninja -C _build
-    - ninja -C _build install
-    - cd ..
-    # So we don't get error about this libfprint file
-    - echo "libfprint/demo/gtk-libfprint-test.ui" >> po/POTFILES.skip
+  <<: *install_libfprint_dev
   script:
     - ./autogen.sh --disable-dependency-tracking
     - make
@@ -40,16 +43,7 @@ build_dev:
 
 test_dev:
   stage: test
-  before_script:
-    - 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 -Ddoc=false
-    - ninja -C _build
-    - ninja -C _build install
-    - cd ..
-    # So we don't get error about this libfprint file
-    - echo "libfprint/demo/gtk-libfprint-test.ui" >> po/POTFILES.skip
+  <<: *install_libfprint_dev
   script:
     - ./autogen.sh --disable-dependency-tracking
     - make