From c3b250ba2eb6e133992cb99cbae7480fbffd47da Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 6 Jan 2023 09:22:50 +1000
Subject: [PATCH] gitlab CI: compress the file inclusion a bit

Just make it a bunch of files from a single project, rather than one
project each per file.
---
 .gitlab-ci.yml         | 4 ++--
 .gitlab-ci/ci.template | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86f72c8..0957049 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,10 @@
 .templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
-  # Fedora container builder template
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
-    file: '/templates/fedora.yml'
+    file:
+      - '/templates/fedora.yml'
 
 stages:
   - prep             # prep work like rebuilding the container images if there is a change
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 85a2fb8..a983352 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -11,12 +11,12 @@
 .templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
-  {% for distro in distributions|sort(attribute="name") %}
-  {% if not distro.does_not_have_ci_templates %}
-  # {{ distro.name.capitalize() }} container builder template
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
-    file: '/templates/{{distro.name}}.yml'
+    file:
+  {% for distro in distributions|sort(attribute="name") %}
+  {% if not distro.does_not_have_ci_templates %}
+      - '/templates/{{distro.name}}.yml'
   {% endif %}
   {% endfor %}