From 6b1f30f3594c659435bb14c8ff1e70c69fdfb633 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 17 Apr 2025 10:34:33 +0200 Subject: [PATCH] ci: Fix Android container structured tagging checks Structured tagging is used to verify the checksum of the component we're building. In Android's case, this is currently only used for ANGLE. Move the build-time check to the debian/x86_64_test-android container, where ANGLE is built. Previously, having this definition in .android-variables meant that every Android test job inherited the ANGLE_TAG variable, making it impossible to use Mesa as the GLES driver in CI. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 9b7cd0162a4..0d15b31b34d 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -215,8 +215,6 @@ debian/s390x_build: # Android NDK cross-build image .android-variables: - extends: - - .container-builds-android variables: ANDROID_VERSION: 14 ANDROID_NDK_VERSION: "r27c" @@ -236,7 +234,6 @@ debian/s390x_build: debian/android_build: extends: - .android-variables - - .container-builds-android - .use-debian/x86_64_build-base variables: MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG} @@ -463,6 +460,7 @@ debian/x86_64_test-android: extends: - .android-variables - .use-debian/x86_64_test-base + - .container-builds-android variables: MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}