From 427c7f382aac31caea69cc8246d5021b7fe91f7c Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 7 Apr 2025 08:54:52 +0200 Subject: [PATCH] ci/container: Remove double build sections in test-* containers These sections were redundant since the respective scripts already set them. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/debian/test-base.sh | 3 --- .gitlab-ci/container/debian/test-vk.sh | 2 -- 2 files changed, 5 deletions(-) diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 3d7eea46e77..52b54546322 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -202,7 +202,6 @@ fi # crosvm build fails on ARMv7 due to Xlib type-size issues if [ "$DEBIAN_ARCH" != "armhf" ]; then - uncollapsed_section_switch crosvm "Building crosvm" . .gitlab-ci/container/build-crosvm.sh fi @@ -212,8 +211,6 @@ fi ############### Build apitrace -uncollapsed_section_switch apitrace "Building apitrace" - . .gitlab-ci/container/build-apitrace.sh ############### Uninstall the build software diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index e8638b86db0..99c1818b5aa 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -120,7 +120,6 @@ rm -rf /VK-GL-CTS ############### Build Fossilize if [ "$DEBIAN_ARCH" != "armhf" ]; then - uncollapsed_section_switch fossilize "Building Fossilize" . .gitlab-ci/container/build-fossilize.sh fi @@ -128,7 +127,6 @@ fi # gfxreconstruct thinks that ARMv7-on-AArch64 is cross-compilation if [ "$DEBIAN_ARCH" != "armhf" ]; then - uncollapsed_section_switch gfxreconstruct "Building gfxreconstruct" . .gitlab-ci/container/build-gfxreconstruct.sh fi