From 68054d0fe39ce8b15d15fe0e7e3616f4426400b5 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Fri, 28 Feb 2025 15:52:35 +0200
Subject: [PATCH] ci: Reuse xserver created by meson-dist job in driver build
 jobs

Currently each driver build job also builds the server. This is bad use
of resources because server build takes way more resources compared to a
driver build. Reusing already built xserver would resolve the issue.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1806>
---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ce66b168..3740c645f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,8 +273,9 @@ xf86-driver-build-test:
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware
               SHA: xf86-video-vmware-13.4.0
     script:
-        # Install the server first
-        - .gitlab-ci/meson-build.sh --skip-test --run-install
+        # built xserver is taken from meson-dist job
+        - export PKG_CONFIG_PATH=$(pwd)/xserver-tarball/install/lib/x86_64-linux-gnu/pkgconfig
+        - export ACLOCAL_PATH=$(pwd)/xserver-tarball/install/share/aclocal/
         - unset MESON_EXTRA_ARGS
         - DRIVER=$(basename $REPO)
         - git clone "$REPO" "$DRIVER"
@@ -287,7 +288,9 @@ xf86-driver-build-test:
              ./autogen.sh && make
           fi
     needs:
-        - "meson"
+        - meson-dist
+    dependencies:
+        - meson-dist
     variables:
         GIT_DEPTH: 1
         MESON_ARGS: -Dprefix=/usr/