From 353b372ccbd338033cb4cd75841e60f88996e78e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 10 May 2024 14:51:39 +0200
Subject: [PATCH] ci: compactify redundant declarations via matrix

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 .gitlab-ci.yml | 53 ++++++++------------------------------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8389500..8e560c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,57 +46,20 @@ container-build:
   script:
   - ./autogen.sh
   - make -j$(nproc) check V=1
+  - make install V=1
+  - make -j$(nproc) distcheck
   variables:
     CFLAGS: "-pipe -g -O2 -Werror"
     ACLOCAL_PATH: /usr/local/xserver-$XSERVER_VERSION/share/aclocal
     PKG_CONFIG_PATH: /usr/local/xserver-$XSERVER_VERSION/lib/pkgconfig
 
-xserver-21.1:
+linux:
   extends: .default_build
-  script:
-  - ./autogen.sh
-  - make -j$(nproc) check V=1
-  - make install V=1
-  - make -j$(nproc) distcheck
-  variables:
-    XSERVER_VERSION: "21.1"
+  parallel:
+    matrix:
+      - XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"]
 
-xserver-21.1-clang:
-  extends: .default_build
-  variables:
-    CC: clang
-    XSERVER_VERSION: "21.1"
-
-xserver-1.20:
-  extends: .default_build
-  variables:
-    XSERVER_VERSION: "1.20"
-
-xserver-1.20-clang:
-  extends: .default_build
-  variables:
-    CC: clang
-    XSERVER_VERSION: "1.20"
-
-xserver-1.18:
-  extends: .default_build
-  script:
-  - ./autogen.sh --disable-glamor
-  - make -j$(nproc) check V=1
-  variables:
-    XSERVER_VERSION: "1.18"
-
-xserver-1.18-clang:
-  extends: xserver-1.18
-  variables:
-    CC: clang
-
-xserver-1.19:
-  extends: .default_build
-  variables:
-    XSERVER_VERSION: "1.19"
-
-xserver-1.19-clang:
-  extends: xserver-1.19
+linux-clang:
+  extends: linux
   variables:
     CC: clang