ci/alpine: control wayland & wayland-protocols versions
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33659>
This commit is contained in:
committed by
Marge Bot
parent
3695a6d3fe
commit
64e68b1ac0
@@ -56,8 +56,6 @@ DEPS=(
|
||||
spirv-tools-dev
|
||||
spirv-llvm-translator-dev
|
||||
util-macros
|
||||
wayland-dev
|
||||
wayland-protocols
|
||||
)
|
||||
|
||||
apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
|
||||
@@ -66,6 +64,8 @@ pip3 install --break-system-packages sphinx===5.1.1 hawkmoth===0.16.0
|
||||
|
||||
. .gitlab-ci/container/container_pre_build.sh
|
||||
|
||||
EXTRA_MESON_ARGS='--prefix=/usr' \
|
||||
. .gitlab-ci/container/build-wayland.sh
|
||||
|
||||
############### Uninstall the build software
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ uncollapsed_section_start wayland "Building Wayland"
|
||||
|
||||
# When changing this file, you need to bump the following
|
||||
# .gitlab-ci/image-tags.yml tags:
|
||||
# ALPINE_X86_64_BUILD_TAG
|
||||
# DEBIAN_BUILD_TAG
|
||||
# DEBIAN_TEST_ANDROID_TAG
|
||||
# DEBIAN_TEST_GL_TAG
|
||||
|
||||
@@ -38,7 +38,7 @@ variables:
|
||||
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
|
||||
DEBIAN_PYUTILS_TAG: "20250129-lavacli"
|
||||
|
||||
ALPINE_X86_64_BUILD_TAG: "20250128-llversionm"
|
||||
ALPINE_X86_64_BUILD_TAG: "20250221-wlproto"
|
||||
ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
|
||||
FEDORA_X86_64_BUILD_TAG: "20250128-llversionm"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user