From 1f34eb527ce52607a1131339899696cc7f0856ee Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 7 Aug 2024 15:16:31 +0200
Subject: [PATCH] ci/build: reuse alpine llvm version to make sure it stays
 coherent

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30657>
---
 .gitlab-ci/build/gitlab-ci.yml     | 1 -
 .gitlab-ci/container/gitlab-ci.yml | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 2eb65b29ee1..74f7a233de5 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -272,7 +272,6 @@ alpine-build-testing:
       -D egl=enabled
       -D glvnd=disabled
       -D platforms=wayland
-    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/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index df1ff8b5db4..277a0f78a1f 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -346,7 +346,7 @@ alpine/x86_64_build:
     - .alpine/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
-    LLVM_VERSION: 18
+    LLVM_VERSION: &alpine-llvm_version 18
   rules:
     # Note: the next three lines must remain in that order, so that the rules
     # in `linkcheck-docs` catch nightly pipelines before the rules in `pages`
@@ -362,6 +362,7 @@ alpine/x86_64_build:
   variables:
     MESA_IMAGE_PATH: "alpine/x86_64_build"
     MESA_IMAGE_TAG: *alpine-x86_64_build
+    LLVM_VERSION: *alpine-llvm_version
   needs:
     - alpine/x86_64_build