diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh index f8e5b2c24b0..07135102c68 100644 --- a/.gitlab-ci/container/alpine/x86_64_build.sh +++ b/.gitlab-ci/container/alpine/x86_64_build.sh @@ -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 diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh index d6117254e87..446367bc8f6 100644 --- a/.gitlab-ci/container/build-wayland.sh +++ b/.gitlab-ci/container/build-wayland.sh @@ -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 diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 02088c85837..f24826e8928 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -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"