From c319cb627f202de361de0ab0281926baf664a323 Mon Sep 17 00:00:00 2001 From: Collabora's Gfx CI Team Date: Tue, 28 Oct 2025 00:08:31 +0000 Subject: [PATCH] Uprev ANGLE to 127a84404b88dbc4327ffb7f831a9a36c3b111bc https://github.com/google/angle/compare/e9626fbced6841d804e7eaf48bb078770822032b...127a84404b88dbc4327ffb7f831a9a36c3b111bc Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-angle.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/amd/ci/angle-radv-stoney-fails.txt | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index bb6736db1af..fdcb182c918 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,6 +1,6 @@ variables: CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7 - CONDITIONAL_BUILD_ANGLE_TAG: 2388089f6225e4b5542d395cdf23de2f + CONDITIONAL_BUILD_ANGLE_TAG: efd57e99d51361944f87b9466356b0ce CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 21ab2c66f54777163dd038dc4cfcfde6 diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index ffece976770..38d31386603 100755 --- a/.gitlab-ci/container/build-angle.sh +++ b/.gitlab-ci/container/build-angle.sh @@ -13,7 +13,7 @@ section_start angle "Building ANGLE" # setting up the environment variables locally ci_tag_build_time_check "ANGLE_TAG" -ANGLE_REV="e9626fbced6841d804e7eaf48bb078770822032b" +ANGLE_REV="127a84404b88dbc4327ffb7f831a9a36c3b111bc" DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7775feea42e..62e755ffffb 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20250926-D3D618" DEBIAN_TEST_BASE_TAG: "20250926-gitlab" - DEBIAN_TEST_ANDROID_TAG: "20251026-angle-e9" - DEBIAN_TEST_GL_TAG: "20251105-piglit-53" + DEBIAN_TEST_ANDROID_TAG: "20251117-angle-12" + DEBIAN_TEST_GL_TAG: "20251117-angle-12" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20251111-vkd3d" diff --git a/src/amd/ci/angle-radv-stoney-fails.txt b/src/amd/ci/angle-radv-stoney-fails.txt index 7b6eb40dc11..e1a648aaab5 100644 --- a/src/amd/ci/angle-radv-stoney-fails.txt +++ b/src/amd/ci/angle-radv-stoney-fails.txt @@ -43,9 +43,6 @@ multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.multiply,Fail multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.overlay,Fail multisample-dEQP-GLES31.functional.blend_equation_advanced.basic.screen,Fail -# new with ANGLE 2024-10-17 -KHR-GLES31.core.texture_buffer.texture_buffer_max_size,Fail - # New failure with ANGLE 2025-02-12 KHR-GLES3.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit,Crash