xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6ec89c91f35e1085203402c3bb095ca89eb08eca
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Feb 12 12:32:30 2025 +0100

    ci: update freebsd builder image
    
    FreeBSD upstream removed image for 14.0 image, so we need to update.
    Also increasing image size, since the new images are too small.
    (needs update of ci-templates)
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1784>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ccb7c05c..25224673e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha c5626190ec14b475271288dda7a7dae8dbe0cd76 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha ef5e4669b7500834a17ffe9277e15fbb6d977fff # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 # FDO_DISTRIBUTION_TAG is the tag of the docker image used for the build jobs.
 # If the image doesn't exist yet, the docker-image stage generates it.
@@ -22,9 +22,9 @@ variables:
     XORG_DEBIAN_VERSION:  'bullseye-slim'
     XORG_DEBIAN_EXEC:     'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
     XORG_DEBIAN_TAG:      '2025-02-12-xts'
-    XORG_FREEBSD_VERSION: '14.0'
+    XORG_FREEBSD_VERSION: '14.2'
     XORG_FREEBSD_EXEC:    ''
-    XORG_FREEBSD_TAG:     '2024-06-10.0'
+    XORG_FREEBSD_TAG:     '2025-02-18-vm-image'
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -110,6 +110,7 @@ stages:
     FDO_DISTRIBUTION_VERSION:   '$XORG_FREEBSD_VERSION'
     FDO_DISTRIBUTION_EXEC:      ''
     FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim'
+    FDO_IMAGE_SIZE:             '30G'
 
 debian-bullseye:
   extends: