From 09f8df82c8a18cf23527d1481ec8f186fc26d7ff Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Fri, 2 Aug 2024 14:56:29 +0900
Subject: [PATCH] ci/alpine: build test with LLVM 18

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30482>
---
 .gitlab-ci/build/gitlab-ci.yml              | 2 +-
 .gitlab-ci/container/alpine/x86_64_build.sh | 2 +-
 .gitlab-ci/image-tags.yml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 1d450f90fa4..ad4ad96f10e 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -272,7 +272,7 @@ alpine-build-testing:
       -D egl=enabled
       -D glvnd=disabled
       -D platforms=wayland
-    LLVM_VERSION: "16"
+    LLVM_VERSION: "18"
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D dri3=enabled
diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh
index eb5bfa711e8..cda83fc0f6d 100644
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -8,7 +8,7 @@
 set -e
 set -o xtrace
 
-export LLVM_VERSION="${LLVM_VERSION:=16}"
+export LLVM_VERSION="${LLVM_VERSION:=18}"
 
 EPHEMERAL=(
 )
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 67eacaf357b..08014a7f53e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -32,7 +32,7 @@ variables:
    DEBIAN_TEST_VK_TAG: "20240808-piglit-04"
    KERNEL_ROOTFS_TAG: "20240808-piglit-04"
 
-   ALPINE_X86_64_BUILD_TAG: "20240717-pyyaml"
+   ALPINE_X86_64_BUILD_TAG: "20240808-llvm"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
    FEDORA_X86_64_BUILD_TAG: "20240717-pyyaml"
    KERNEL_TAG: "v6.6.21-mesa-f8ea"