From 19607c9ff4a72509b1297b950cf56045371acf6b Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Thu, 28 Mar 2024 22:11:11 +0000
Subject: [PATCH] ci: Bump wayland-protocols version to 1.34

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25709>
---
 .gitlab-ci/container/build-wayland.sh | 11 ++++++++++-
 .gitlab-ci/image-tags.yml             | 16 ++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index dd3fc6a4081..da9089a4356 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -3,8 +3,17 @@
 
 set -ex
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.31"
+export WAYLAND_PROTOCOLS_VERSION="1.34"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index af60bb6f51f..cfd197391ef 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -16,7 +16,7 @@ variables:
    DEBIAN_BASE_TAG: "20240307-virglcrosvm"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240322-dxheaders"
+   DEBIAN_BUILD_TAG: "20240401-wlproto"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -24,14 +24,14 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240311-runner"
-   DEBIAN_X86_64_TEST_GL_TAG: "20240326-vvl"
-   DEBIAN_X86_64_TEST_VK_TAG: "20240317-direct_drm"
-   KERNEL_ROOTFS_TAG: "20240326-vvl"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240401-wlproto"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240401-wlproto"
+   DEBIAN_X86_64_TEST_VK_TAG: "20240401-wlproto"
+   KERNEL_ROOTFS_TAG: "20240401-wlproto"
 
-   ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"
-   FEDORA_X86_64_BUILD_TAG: "20240301-mold"
+   ALPINE_X86_64_BUILD_TAG: "20240401-wlproto"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
+   FEDORA_X86_64_BUILD_TAG: "20240401-wlproto"
    KERNEL_TAG: "v6.6.21-mesa-19fc"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"