ci/build: reuse alpine llvm version to make sure it stays coherent
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30657>
This commit is contained in:
committed by
Marge Bot
parent
34aba675aa
commit
1f34eb527c
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user