diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 6e475060a53..cc32d01d236 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: 2dfd3e288249e4776ef6866d34d344d4 - CONDITIONAL_BUILD_ANGLE_TAG: 09747e85cb75ce82b9302bf1cdb1fd58 + CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9 CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index ab1ef226409..7da3ffb049b 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="599125448d7ad53b2868a7b5d2e3e8d3bfbc1717" +ANGLE_REV="5e591d03650dd427001e355f4884b857cadab113" DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined @@ -144,9 +144,9 @@ fi # The Chromium build system hardcodes these flags, and they're not compatible # with our clang19 'unbundled' toolchain. See: # https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#619 -# https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#1882 +# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548 sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn -sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/compiler/BUILD.gn +sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/sanitizers/sanitizers.gni ( # The 'unbundled' toolchain configuration requires clang, and it also needs to diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f08ded9ee3c..458e4190382 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20260309-D3D619" DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner" - DEBIAN_TEST_ANDROID_TAG: "20260402-cuttlefish" - DEBIAN_TEST_GL_TAG: "20260410-piglit-11" + DEBIAN_TEST_ANDROID_TAG: "20260414-angle-5e" + DEBIAN_TEST_GL_TAG: "20260414-angle-5e" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20260310-vkd3d"