ci/container: Include ANGLE in the arm64 test-gl container

Build ANGLE in the arm64 test-gl containers.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33542>
This commit is contained in:
Valentine Burley 2025-02-11 09:28:20 +01:00 committed by Marge Bot
parent 45fe200222
commit 612f56cb5e
2 changed files with 9 additions and 1 deletions

View file

@ -44,6 +44,7 @@ EPHEMERAL=(
libxrandr-dev
libxrender-dev
"llvm-${LLVM_VERSION}-dev"
"lld-${LLVM_VERSION}"
make
meson
ocl-icd-opencl-dev
@ -66,6 +67,13 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
section_end debian_setup
############### Build ANGLE
if [ "$DEBIAN_ARCH" == "arm64" ]; then
ANGLE_TARGET=linux \
. .gitlab-ci/container/build-angle.sh
fi
############### Build piglit
PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON

View file

@ -31,7 +31,7 @@ variables:
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle"
DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
DEBIAN_TEST_GL_TAG: "20250215-add-angle"
DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
KERNEL_ROOTFS_TAG: "20250212-up-angle"