fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/android: Check ANGLE version

Browse source 
Save the current git hash to /angle/hash after applying local patches,
and use it to verify that we're using our own ANGLE build in
Cuttlefish.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Reviewed-by: Eric Engestrom <None>
Reviewed-by: Antonio Ospite <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33377>
This commit is contained in:
Valentine Burley 2025-02-04 09:56:09 +01:00 • committed by Marge Bot
parent 0fc4aef848
commit 2aab9ef3fd
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci/container/build-angle.sh
View file

@ -40,6 +40,9 @@ done
git log --reverse --oneline $ANGLE_REV.. --format='- %s' git log --reverse --oneline $ANGLE_REV.. --format='- %s'
} > /angle/version } > /angle/version
# Save the current git hash to /angle/hash after applying local patches
git rev-parse HEAD > /angle/hash
GCLIENT_CUSTOM_VARS=() GCLIENT_CUSTOM_VARS=()
GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl=False') GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl=False')
GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl_testing=False') GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl_testing=False')

15
.gitlab-ci/cuttlefish-runner.sh
View file

@ -170,10 +170,19 @@ $ADB shell start
# Check what GLES implementation Surfaceflinger is using after copying the new mesa libraries # Check what GLES implementation Surfaceflinger is using after copying the new mesa libraries
while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)"
MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep "${MESA_BUILD_VERSION}$"; then if [ "$USE_ANGLE" = 1 ]; then
echo "Fatal: Android is loading a wrong version of the Mesa3D libs: ${MESA_RUNTIME_VERSION}" 1>&2 ANGLE_HASH=$(head -c 12 /angle/hash)
if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep --quiet "${ANGLE_HASH}"; then
echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2
exit 1 exit 1
fi
else
MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep --quiet "${MESA_BUILD_VERSION}$"; then
echo "Fatal: Android is loading a wrong version of the Mesa3D libs: ${MESA_RUNTIME_VERSION}" 1>&2
exit 1
fi
fi fi
BASELINE="" BASELINE=""

4
.gitlab-ci/image-tags.yml
View file

@ -30,10 +30,10 @@ variables:
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20250204-droid-angle" DEBIAN_TEST_ANDROID_TAG: "20250206-right-angle"
DEBIAN_TEST_GL_TAG: "20250204-fix-deqp" DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
DEBIAN_TEST_VK_TAG: "20250204-fix-deqp" DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
KERNEL_ROOTFS_TAG: "20250204-prep-angle" KERNEL_ROOTFS_TAG: "20250206-right-angle"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20250129-lavacli" DEBIAN_PYUTILS_TAG: "20250129-lavacli"