gitlab CI: use multiple extends for the default artifact/build snippets
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 27 Nov 2019 21:52:21 +0000 (07:52 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 28 Nov 2019 05:00:26 +0000 (05:00 +0000)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
.gitlab-ci.yml

index ce9435fbd5d4a3914f03ab75ed5e8e7c947e3f26..d68c721916dc89ce2387f95959ade14b99459130 100644 (file)
@@ -112,7 +112,7 @@ variables:
   # cancel run when a newer version is pushed to the branch
   interruptible: true
 
-.default_artifacts: &default_artifacts
+.default_artifacts:
   artifacts:
     name: "meson-logs-$CI_JOB_NAME"
     when: always
@@ -121,7 +121,7 @@ variables:
       - $MESON_BUILDDIR/meson-logs
 
 # The default build instructions
-.default_build: &default_build
+.default_build:
   script:
     - rm -rf "$MESON_BUILDDIR"
     - meson "$MESON_BUILDDIR" $MESON_ARGS
@@ -433,9 +433,9 @@ freebsd:11.2@container-clean:
 .build@template:
   extends:
     - .policy
+    - .default_artifacts
+    - .default_build
   stage: build
-  <<: *default_artifacts
-  <<: *default_build
   dependencies: []
 
 #