From 115336894687d2e955c087045447700781839fe0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 15 Feb 2023 08:23:46 +1000
Subject: [PATCH] CI: move the package list to the config.yml file

Using templates for our CI is a bit of overkill but while we have it,
let's make use of it.
---
 .gitlab-ci.yml         |  2 +-
 .gitlab-ci/ci.template |  4 +++-
 .gitlab-ci/config.yml  | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cbccfc..214e3dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
   # See the documentation here:                                                 #
   # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html  #
   ###############################################################################
-  FEDORA_PACKAGES:    'git diffutils gcc gcc-c++ pkgconf-pkg-config meson systemd-devel protobuf-c-devel libxkbcommon-devel doxygen python3-attrs python3-pytest python3-dbusmock'
+  FEDORA_PACAKGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config meson systemd-devel protobuf-c-devel libxkbcommon-devel doxygen python3-attrs python3-pytest python3-dbusmock '
   ############################ end of package lists #############################
 
   # these tags should be updated each time the list of packages is updated
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 2ba07ab..a69f2fa 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -38,7 +38,9 @@ variables:
   # See the documentation here:                                                 #
   # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html  #
   ###############################################################################
-  FEDORA_PACKAGES:    'git diffutils gcc gcc-c++ pkgconf-pkg-config meson systemd-devel protobuf-c-devel libxkbcommon-devel doxygen python3-attrs python3-pytest python3-dbusmock'
+{% for distro in distributions %}
+  {{distro.name.upper()}}_PACAKGES: '{% for p in distro.packages %}{{p}} {% endfor %}'
+{% endfor %}
   ############################ end of package lists #############################
 
   # these tags should be updated each time the list of packages is updated
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index c4a0183..5a8c632 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -11,6 +11,20 @@ distributions:
     versions:
       - '37' # update the pages job when bumping the version
     use_for_custom_build_tests: true
+    packages:
+      - git
+      - diffutils
+      - gcc
+      - gcc-c++
+      - pkgconf-pkg-config
+      - meson
+      - systemd-devel
+      - protobuf-c-devel
+      - libxkbcommon-devel
+      - doxygen
+      - python3-attrs
+      - python3-pytest
+      - python3-dbusmock
 
 pages:
   distro: fedora