From b1af5780d1378ff6a4b2e0396b45d1665105d611 Mon Sep 17 00:00:00 2001 From: Collabora's Gfx CI Team Date: Tue, 15 Apr 2025 00:09:22 +0000 Subject: [PATCH] Uprev ANGLE to a3f2545f6bb3 https://github.com/google/angle/compare/3818d37d5e94317f01810053b8f28c1f1e8b98e6...a3f2545f6bb3e8d27827dceb2b4e901673995ad1 Also disable -Werror, because we're not necessarily using the same toolchain or dependencies as the upstream builds. Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-angle.sh | 3 ++- .gitlab-ci/image-tags.yml | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 025bd7ec6bd..cff5183edca 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,2 +1,2 @@ variables: - CONDITIONAL_BUILD_ANGLE_TAG: 1a6f71ca4a2fcc40b8c2a8442732df70 + CONDITIONAL_BUILD_ANGLE_TAG: ab19bccfd3858c539ba8cb8d9b52a003 diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index 9e66e51201e..9ebf3646ae8 100755 --- a/.gitlab-ci/container/build-angle.sh +++ b/.gitlab-ci/container/build-angle.sh @@ -13,7 +13,7 @@ uncollapsed_section_start angle "Building ANGLE" # setting up the environment variables locally ci_tag_build_time_check "ANGLE_TAG" -ANGLE_REV="3818d37d5e94317f01810053b8f28c1f1e8b98e6" +ANGLE_REV="a3f2545f6bb3e8d27827dceb2b4e901673995ad1" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined if [[ -z "${ANGLE_ARCH:-}" ]]; then @@ -93,6 +93,7 @@ is_component_build=false is_debug=false target_cpu="${ANGLE_ARCH}" target_os="${ANGLE_TARGET}" +treat_warnings_as_errors=false EOF case "$ANGLE_TARGET" in diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0661f4184ee..6621c539b4e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,10 +23,10 @@ variables: DEBIAN_BUILD_TAG: "20250324-android" - DEBIAN_TEST_ANDROID_TAG: "20250411-vkcts-main" - DEBIAN_TEST_GL_TAG: "20250414-vvl" + DEBIAN_TEST_ANDROID_TAG: "20250415-anglit" + DEBIAN_TEST_GL_TAG: "20250415-anglit" DEBIAN_TEST_VK_TAG: "20250411-vkcts-main" - KERNEL_ROOTFS_TAG: "20250414-vvl" + KERNEL_ROOTFS_TAG: "20250415-anglit" DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5"