[gnome-build-meta/abderrahim/child-pipelines: 2/5] .gitlab-ci.yml: use extend instead of yaml anchors for arch-specific config

[Abderrahim Kitouni <akitouni src gnome org>]

commit c005d92149f5fd0a9c8797a30f629cb0c138d8d0
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Aug 4 23:20:58 2020 +0100

    .gitlab-ci.yml: use extend instead of yaml anchors for arch-specific config

 .gitlab-ci.yml | 92 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 52 insertions(+), 40 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f19c8f50..ff948afd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,7 @@ default:
 # Architecture specific settings
 #
 
-.x86_64: &x86_64
+.x86_64:
   image: "${DOCKER_AMD64}"
   tags:
   - x86_64
@@ -201,7 +201,7 @@ default:
   variables:
     ARCH: x86_64
 
-.i686: &i686
+.i686:
   image: "${DOCKER_AMD64}"
   tags:
   - x86_64
@@ -209,7 +209,7 @@ default:
   variables:
     ARCH: i686
 
-.aarch64: &aarch64
+.aarch64:
   image: "${DOCKER_AARCH64}"
   tags:
   - aarch64
@@ -217,7 +217,7 @@ default:
   variables:
     ARCH: aarch64
 
-.arm: &arm
+.arm:
   image: "${DOCKER_AARCH64}"
   tags:
   - armhf
@@ -225,7 +225,7 @@ default:
   variables:
     ARCH: arm
 
-.ppc64le: &ppc64le
+.ppc64le:
   image: "${DOCKER_PPC64LE}"
   tags:
   - ppc64le
@@ -239,7 +239,7 @@ default:
 #
 
 track:
-  <<: *x86_64
+  extends: .x86_64
   stage: track
   interruptible: true
   script:
@@ -255,36 +255,43 @@ track:
 
 
 build-gnome-core-x86_64:
-  extends: .build-template
-  <<: *x86_64
+  extends:
+  - .build-template
+  - .x86_64
 
 build-gnome-core-i386:
-  extends: .build-template
-  <<: *i686
+  extends:
+  - .build-template
+  - .i686
 
 build-gnome-core-aarch64:
-  extends: .build-template
-  <<: *aarch64
+  extends:
+  - .build-template
+  - .aarch64
 
 build-gnome-core-arm:
-  extends: .build-template
-  <<: *arm
+  extends:
+  - .build-template
+  - .arm
 
 build-gnome-core-ppc64le:
-  extends: .build-template
-  <<: *ppc64le
+  extends:
+  - .build-template
+  - .ppc64le
 
 
 vm-image-x86_64:
-  extends: .vm-image-template
+  extends:
+  - .vm-image-template
+  - .x86_64
   # run as soon as the x86_64 build job is done, don't wait for other arches
   needs:
   - track
   - job: build-gnome-core-x86_64
     artifacts: false
-  <<: *x86_64
 
 pinebook-pro-image:
+  extends: .aarch64
   stage: image
   script:
     - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build boards/pinebook-pro/image.bst
@@ -301,9 +308,9 @@ pinebook-pro-image:
   - track
   - job: build-gnome-core-aarch64
     artifacts: false
-  <<: *aarch64
 
 rock64-image:
+  extends: .aarch64
   stage: image
   script:
     - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build boards/rock64/image.bst
@@ -320,9 +327,9 @@ rock64-image:
   - track
   - job: build-gnome-core-aarch64
     artifacts: false
-  <<: *aarch64
 
 raspberrypi-4-image:
+  extends: .aarch64
   stage: image
   script:
     - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build boards/raspberrypi-4/image.bst
@@ -339,10 +346,10 @@ raspberrypi-4-image:
   - track
   - job: build-gnome-core-aarch64
     artifacts: false
-  <<: *aarch64
 
 
 flatpak-prepare:
+  extends: .x86_64
   stage: prepare_flatpak
   dependencies: []
   script:
@@ -351,9 +358,9 @@ flatpak-prepare:
     paths:
     - build.txt
   rules: *flatpak-publish-rules
-  <<: *x86_64
 
 ostree-prepare:
+  extends: .x86_64
   stage: prepare_ostree
   dependencies: []
   script:
@@ -363,33 +370,39 @@ ostree-prepare:
     paths:
     - build.txt
   rules: *ostree-publish-rules
-  <<: *x86_64
 
 flatpak-x86_64:
-  extends: .flatpak-template
-  <<: *x86_64
+  extends:
+  - .flatpak-template
+  - .x86_64
 
 flatpak-i386:
-  extends: .flatpak-template
-  <<: *i686
+  extends:
+  - .flatpak-template
+  - .i686
 
 flatpak-aarch64:
-  extends: .flatpak-template
-  <<: *aarch64
+  extends:
+  - .flatpak-template
+  - .aarch64
 
 flatpak-arm:
-  extends: .flatpak-template
-  <<: *arm
+  extends:
+  - .flatpak-template
+  - .arm
 
 flatpak-ppc64le:
-  extends: .flatpak-template
-  <<: *ppc64le
+  extends:
+  - .flatpak-template
+  - .ppc64le
 
 ostree-x86_64:
-  extends: .ostree-template
-  <<: *x86_64
+  extends:
+  - .ostree-template
+  - .x86_64
 
 flatpak-finish:
+  extends: .x86_64
   stage: finish_flatpak
   dependencies: [flatpak-prepare]
   script:
@@ -397,9 +410,9 @@ flatpak-finish:
   - flat-manager-client publish --wait $(cat build.txt)
   - flat-manager-client purge $(cat build.txt)
   rules: *flatpak-publish-rules
-  <<: *x86_64
 
 flatpak-finish-failed:
+  extends: .x86_64
   stage: finish_flatpak
   dependencies: [flatpak-prepare]
   script:
@@ -409,9 +422,9 @@ flatpak-finish-failed:
     when: never
   - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
     when: on_failure
-  <<: *x86_64
 
 ostree-finish:
+  extends: .x86_64
   stage: finish_ostree
   dependencies: [ostree-prepare]
   script:
@@ -420,9 +433,9 @@ ostree-finish:
   - flat-manager-client publish --wait $(cat build.txt)
   - flat-manager-client purge $(cat build.txt)
   rules: *ostree-publish-rules
-  <<: *x86_64
 
 ostree-finish-failed:
+  extends: .x86_64
   stage: finish_ostree
   dependencies: [ostree-prepare]
   script:
@@ -431,10 +444,9 @@ ostree-finish-failed:
   rules:
   - if: $CI_COMMIT_REF_NAME == "master"
     when: on_failure
-  <<: *x86_64
 
 cve_report:
-  <<: *x86_64
+  extends: .x86_64
   stage: reports
   dependencies: [track]
   script: