xserver: Branch 'master' - 4 commits

[GitLab Mirror]

 .gitlab-ci.yml |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 68054d0fe39ce8b15d15fe0e7e3616f4426400b5
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Feb 28 15:52:35 2025 +0200

    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>

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/
commit 8e5a5cf2c119ddd537ab42c3eead62388cac4f9e
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Feb 28 15:52:34 2025 +0200

    ci: Add install prefix to the artifacts of meson-dist job
    
    This will allow to reuse built xserver on subsequent driver build jobs
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1806>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bd8ebb63..2ce66b168 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -235,6 +235,7 @@ meson-dist:
         paths:
             - $MESON_BUILDDIR/meson-logs/
             - $MESON_BUILDDIR/xserver-*/$MESON_BUILDDIR/meson-logs/
+            - xserver-tarball/install/
     script:
         - .gitlab-ci/meson-build.sh --run-dist
         - mkdir xserver-tarball
commit f7d2e810ba32b1cfa766a82920684f4580d91fda
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Feb 28 15:52:33 2025 +0200

    ci: Adjust prefix instead of setting DESTDIR for meson-dist job
    
    This ensures that the pkg-config files installed to
    xserver-tarball/install will have correct paths. This is needed so that
    xf86-driver-build-test will be able to reuse this installation of
    xserver. It will be passed to that job via artifacts (subsequent
    commits)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1806>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be9109896..8bd8ebb63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -242,7 +242,7 @@ meson-dist:
         - .gitlab-ci/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install
     variables:
       MESON_DIST_ARGS: --no-tests
-      DESTDIR: xserver-tarball/install/
+      MESON_EXTRA_ARGS: -Dprefix=$CI_PROJECT_DIR/xserver-tarball/install/
 
 xf86-driver-build-test:
     extends:
commit 8d1fa6acde2a78e10d28e212c58069132b70128c
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Fri Feb 28 15:52:32 2025 +0200

    ci: Point to last commit of xf86-video-qxl instead of master branch
    
    This ensures that the tests don't start failing silently after new
    commits are added to the QXL driver.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1806>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 707deebb9..be9109896 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -266,7 +266,7 @@ xf86-driver-build-test:
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
               SHA: e6a4c4740c15ace9dd79dc7c18955f2eb413a6a5 # no release yet
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
-              SHA: master
+              SHA: 989ff620220e8d0555cec38c1508b57dfbcfb0c6 # no release yet
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
               SHA: xf86-video-vesa-2.6.0
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware