[tracker/wip/carlosg/ci-playground] squash!




commit 5697fc05349ca7e48b376906658a74bdf605199f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun May 16 11:23:04 2021 +0200

    squash!

 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e07ef56..d00d6bc79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,7 +109,7 @@ build-alpine-container@x86_64:
   variables:
     GIT_STRATEGY: none
 
-.build-tracker:
+.build-template: &build
   stage: build
   script:
     - meson . build -Db_lto=true -Db_coverage=true -Dsystemd_user_services=false -Dtests_tap_protocol=true 
--prefix /usr
@@ -122,36 +122,36 @@ build-alpine-container@x86_64:
 build-fedora-34@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .build-tracker
     - .tracker.fedora:34@x86_64
   needs:
     - build-fedora-container@x86_64
+  <<: *build
 
 build-fedora-rawhide@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .build-tracker
     - .tracker.fedora:rawhide@x86_64
   needs:
     - build-fedora-rawhide-container@x86_64
+  <<: *build
 
 build-ubuntu-rolling@x86_64:
   extends:
     - .fdo.distribution-image@ubuntu
-    - .build-tracker
     - .tracker.ubuntu:rolling@x86_64
   needs:
     - build-ubuntu-container@x86_64
+  <<: *build
 
 build-alpine-edge@x86_64:
   extends:
     - .fdo.distribution-image@alpine
-    - .build-tracker
     - .tracker.alpine:edge@x86_64
   needs:
     - build-alpine-container@x86_64
+  <<: *build
 
-.test-tracker:
+.test-template: &test
   stage: test
   variables:
     G_SLICE: "always-malloc"
@@ -188,34 +188,34 @@ build-alpine-edge@x86_64:
 test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .test-tracker
     - .tracker.fedora:34@x86_64
   needs:
     - build-fedora-34@x86_64
+  <<: *test
 
 test-fedora-rawhide@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .test-tracker
     - .tracker.fedora:rawhide@x86_64
   needs:
     - build-fedora-rawhide@x86_64
+  <<: *test
 
 test-ubuntu@x86_64:
   extends:
     - .fdo.distribution-image@ubuntu
-    - .test-tracker
     - .tracker.ubuntu:rolling@x86_64
   needs:
     - build-ubuntu-rolling@x86_64
+  <<: *test
 
 test-alpine@x86_64:
   extends:
     - .fdo.distribution-image@alpine
-    - .test-tracker
     - .tracker.alpine:edge@x86_64
   needs:
     - build-alpine-edge@x86_64
+  <<: *test
 
 coverage-analysis:
   extends:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]