diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-11-25 16:59:44 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-11-26 16:06:09 +0000 |
| commit | a2fd507973db3c0675abc9f211f2f4ce09bfa447 (patch) | |
| tree | 0a3735f0b18a6153a7e8a65c1b88968658aacb31 /.gitlab-ci.yml | |
| parent | 9bab991be09db0332ef6d68e8a91f29e0712328d (diff) | |
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>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d50fd05649b..2e0c7b97b2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: |