From 750a815fdf3297214743cd919d0868f0718f40b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 14 Feb 2020 16:17:12 +0100
Subject: [PATCH] ci: Use extends to repeat libfprint builds

This syntax is just nicer and more maintainable than the YAML anchors
---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdc25a3..53fed55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ image: "$FEDORA_IMAGE"
     variables:
       - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
 
-.install_libfprint_dev: &install_libfprint_dev
+.install_libfprint_dev:
   before_script:
     # Make sure we don't build or link against the system libfprint
     - dnf remove -y libfprint-devel
@@ -56,8 +56,9 @@ build_stable:
     - ninja -C _build -v install
 
 build_dev:
-  extends: .fprintd_build_preconditions
-  <<: *install_libfprint_dev
+  extends:
+    - .fprintd_build_preconditions
+    - .install_libfprint_dev
   script:
     - meson _build --werror -Dgtk_doc=true
     - ninja -C _build -v
@@ -69,9 +70,10 @@ build_dev:
       - _build/meson-logs/*.txt
 
 test_dev:
-  extends: .fprintd_build_preconditions
+  extends:
+    - .fprintd_build_preconditions
+    - .install_libfprint_dev
   stage: test
-  <<: *install_libfprint_dev
   script:
     - meson _build -Db_coverage=true
     - meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3