[librsvg-oci-images/altiera/f-docker] ci: further use .extend over yml anchors

[Jordan Petridis <jpetridis src gnome org>]

commit 1b7de0a2bd98d95a1ce80fef4ac0369619039290
Author: Jordan Petridis <jpetridis gnome org>
Date:   Sat Feb 16 18:26:09 2019 +0200

    ci: further use .extend over yml anchors

 .gitlab-ci.yml | 56 +++++++++++++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6d50aa..0438a9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ stages:
 # Expects $DISTRO_NAME variable which should be the name of the distro image ex. ubuntu
 # Expects $DISTRO_VER variable which should be the version distro image ex. 18.04
 # Expects $DOCKERFILE variable which should be the path to the dockerfile
-.distro_template: &distro_build
+.distro build:
     stage: distro
     before_script:
         - export IMAGE=${CI_REGISTRY_IMAGE}/${ARCH}/${DISTRO_NAME}:${DISTRO_VER}
@@ -33,12 +33,13 @@ stages:
 # Expects $COMPILER variable which should be the name of the compiler ex. rustc/gcc
 # Expects $TAG_VERSION variable which should be the version of the compiler minus the minor release ex. 1.24
 # Expects $RUSTC_VERSION variable which should be the version of the compiler ex. 1.24.1
-.rustc_template: &rustc
+.rustc:
     stage: rustc
+    variables:
+        CONTEXT_DIR: 'rustc'
+        DOCKERFILE: 'rustc/rustc'
     before_script:
         - export IMAGE=${CI_REGISTRY_IMAGE}/rustc:${TAG_VERSION}
-        - export DOCKERFILE=rustc/rustc
-        - export CONTEXT_DIR=rustc/
         - sed -e "s|@RUSTC_VERSION@|$RUSTC_VERSION|" rustc/rustc_template > rustc/rustc
     extends: '.base'
     only:
@@ -46,6 +47,7 @@ stages:
             - 'rustc/*'
 
 fedora latest:
+    extends: '.distro build'
     variables:
       ARCH: "amd64"
       DISTRO_NAME: "fedora"
@@ -56,9 +58,9 @@ fedora latest:
         changes:
             - 'fedora/*'
 
-    <<: *distro_build
-
 fedora rawhide:
+    extends: '.distro build'
+    allow_failure: true
     variables:
       ARCH: "amd64"
       DISTRO_NAME: "fedora"
@@ -69,10 +71,8 @@ fedora rawhide:
         changes:
             - 'fedora/*'
 
-    <<: *distro_build
-    allow_failure: true
-
 debian testing:
+    extends: '.distro build'
     variables:
       ARCH: "amd64"
       DISTRO_NAME: "debian"
@@ -83,9 +83,8 @@ debian testing:
         changes:
             - 'debian/*'
 
-    <<: *distro_build
-
 opensuse tumbleweed:
+    extends: '.distro build'
     variables:
       ARCH: "amd64"
       DISTRO_NAME: "opensuse"
@@ -96,9 +95,8 @@ opensuse tumbleweed:
         changes:
             - 'opensuse/*'
 
-    <<: *distro_build
-
 ubuntu 18.04 x86_64:
+    extends: '.distro build'
     variables:
       ARCH: "amd64"
       DISTRO_NAME: "ubuntu"
@@ -109,9 +107,8 @@ ubuntu 18.04 x86_64:
         changes:
             - 'debian/*'
 
-    <<: *distro_build
-
 debian testing i386:
+    extends: '.distro build'
     variables:
       ARCH: "i386"
       DISTRO_NAME: "debian"
@@ -122,9 +119,8 @@ debian testing i386:
         changes:
             - 'debian/*'
 
-    <<: *distro_build
-
 ubuntu 18.04 i386:
+    extends: '.distro build'
     variables:
       ARCH: "i386"
       DISTRO_NAME: "ubuntu"
@@ -135,76 +131,74 @@ ubuntu 18.04 i386:
         changes:
             - 'debian/*'
 
-    <<: *distro_build
-
 rustc 1.32 12:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.32.0"
       TAG_VERSION: "1.32"
-    <<: *rustc
 
 rustc 1.31 11:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.31.1"
       TAG_VERSION: "1.31"
-    <<: *rustc
 
 rustc 1.30 10:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.30.1"
       TAG_VERSION: "1.30"
-    <<: *rustc
 
 rustc 1.29 9:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.29.2"
       TAG_VERSION: "1.29"
-    <<: *rustc
 
 rustc 1.28 8:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.28.0"
       TAG_VERSION: "1.28"
-    <<: *rustc
 
 rustc 1.27 7:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.27.2"
       TAG_VERSION: "1.27"
-    <<: *rustc
 
 rustc 1.26 6:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.26.2"
       TAG_VERSION: "1.26"
-    <<: *rustc
 
 rustc 1.25 5:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.25.0"
       TAG_VERSION: "1.25"
-    <<: *rustc
 
 rustc 1.24 4:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.24.1"
       TAG_VERSION: "1.24"
-    <<: *rustc
 
 rustc 1.23 3:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.23.0"
       TAG_VERSION: "1.23"
-    <<: *rustc
 
 rustc 1.22 2:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.22.1"
       TAG_VERSION: "1.22"
-    <<: *rustc
 
 rustc 1.21 1:
+    extends: '.rustc'
     variables:
       RUSTC_VERSION: "1.21.0"
       TAG_VERSION: "1.21"
-    <<: *rustc