From 0a7ab7da1a92bc3d9cbc5cc60b5df70f8d74a368 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 19 Nov 2024 21:10:06 +0100
Subject: [PATCH] ci/container: move llvm-spirv build section into the script
 itself

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
---
 .gitlab-ci/container/build-llvm-spirv.sh | 4 ++++
 .gitlab-ci/container/debian/test-base.sh | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/build-llvm-spirv.sh b/.gitlab-ci/container/build-llvm-spirv.sh
index 2742298b121..125420c9731 100644
--- a/.gitlab-ci/container/build-llvm-spirv.sh
+++ b/.gitlab-ci/container/build-llvm-spirv.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+uncollapsed_section_start llvm-spirv "Building LLVM-SPIRV-Translator"
+
 VER="${LLVM_VERSION:?llvm not set}.0.0"
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -20,3 +22,5 @@ popd
 
 du -sh "SPIRV-LLVM-Translator-${VER}"
 rm -rf "SPIRV-LLVM-Translator-${VER}"
+
+section_end llvm-spirv
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index 1c7c3fffd4f..b8bf006b601 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -143,8 +143,6 @@ uncollapsed_section_switch mold "Building mold linker"
 
 ############### Build LLVM-SPIRV translator
 
-uncollapsed_section_switch llvmspv "Building LLVM-SPIRV-Translator"
-
 . .gitlab-ci/container/build-llvm-spirv.sh
 
 ############### Build libclc