ci: Consistently build Wayland and protocols
Rather than relying on distro packages, build libwayland and wayland-protocols from known versions everywhere we need it. The only place we do not do so but rely on distro packages is the LAVA rootfs, for which it does not matter right now since the version is sufficiently new, but this could/should be cleaned up later. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11248>
This commit is contained in:
@@ -290,7 +290,7 @@ debian/x86_build-base:
|
||||
- .fdo.container-build@debian
|
||||
- .container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-26-python"
|
||||
MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-wayland"
|
||||
|
||||
.use-debian/x86_build-base:
|
||||
extends:
|
||||
@@ -410,13 +410,13 @@ debian/x86_test-gl:
|
||||
variables:
|
||||
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
|
||||
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-18-crosvm"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-wayland"
|
||||
|
||||
# Debian 11 based x86 test image for VK
|
||||
debian/x86_test-vk:
|
||||
extends: .use-debian/x86_test-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-11-01-deqp"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-wayland"
|
||||
|
||||
# Debian 11 based ARM build image
|
||||
debian/arm_build:
|
||||
@@ -446,7 +446,7 @@ fedora/x86_build:
|
||||
- .container
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 34
|
||||
MESA_IMAGE_TAG: &fedora-x86_build "2021-07-08-bump-libdrm"
|
||||
MESA_IMAGE_TAG: &fedora-x86_build "2021-11-25-wayland"
|
||||
|
||||
.use-fedora/x86_build:
|
||||
extends:
|
||||
|
Reference in New Issue
Block a user