From c472570194a46e6eba35f50885d41979c3abe3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 26 May 2023 10:57:40 +0200
Subject: [PATCH] ci: Use extends to inherit test-setup values

Using the old replace syntax doesn't allow to extend dicts such as
variables or other values, but instead it replaces them.

So use a newer and safer syntax, given we don't need to replace any
parameter where used.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3024>
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b769b7f8..2e93cb287 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -337,7 +337,7 @@ build-wayland-only@x86_64:
     paths:
       - build/meson-logs
 
-.test-setup: &test-setup
+.test-setup:
   variables:
     XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
     GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
@@ -357,7 +357,7 @@ build-wayland-only@x86_64:
 .test-mutter-base:
   extends:
     - .fdo.distribution-image@fedora
-  <<: *test-setup
+    - .test-setup
   stage: test
   after_script:
     - pushd build
@@ -507,7 +507,7 @@ dist-mutter:
     - .fdo.distribution-image@fedora
     - .mutter.fedora@x86_64
     - .build-mutter-base
-  <<: *test-setup
+    - .test-setup
   stage: deploy
   needs:
     - build-fedora-container@x86_64