From b693b704d917f9837aa56e9352b7e55de693e0b9 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 19 Nov 2024 19:30:29 +0100
Subject: [PATCH] ci/container: add sections around the other build scripts

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
---
 .gitlab-ci/container/build-angle.sh           | 4 ++++
 .gitlab-ci/container/build-bindgen.sh         | 3 +++
 .gitlab-ci/container/build-directx-headers.sh | 4 ++++
 .gitlab-ci/container/build-libdrm.sh          | 4 ++++
 .gitlab-ci/container/build-shader-db.sh       | 4 ++++
 .gitlab-ci/container/build-skqp.sh            | 4 ++++
 .gitlab-ci/container/build-va-tools.sh        | 4 ++++
 7 files changed, 27 insertions(+)

diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 96467909e86..deaeffeff13 100644
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -6,6 +6,8 @@
 
 set -uex
 
+uncollapsed_section_start angle "Building angle"
+
 ANGLE_REV="76025caa1a059f464a2b0e8f879dbd4746f092b9"
 SCRIPTS_DIR="$(pwd)/.gitlab-ci"
 ANGLE_PATCH_DIR="${SCRIPTS_DIR}/container/patches"
@@ -97,3 +99,5 @@ rm -rf out
 popd
 rm -rf /depot-tools
 rm -rf /angle-build
+
+section_end angle
diff --git a/.gitlab-ci/container/build-bindgen.sh b/.gitlab-ci/container/build-bindgen.sh
index 5c1f2a3ae76..9ac30eeaf03 100644
--- a/.gitlab-ci/container/build-bindgen.sh
+++ b/.gitlab-ci/container/build-bindgen.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+uncollapsed_section_start bindgen "Building bindgen"
+
 BINDGEN_VER=0.65.1
 CBINDGEN_VER=0.26.0
 
@@ -18,3 +20,4 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local
 
+section_end bindgen
diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh
index 005b45ced59..fd19e548bcb 100644
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -7,9 +7,13 @@
 
 set -uex
 
+uncollapsed_section_start directx-headers "Building directx-headers"
+
 git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
 meson install -C build
 popd
 rm -rf DirectX-Headers
+
+section_end directx-headers
diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
index a8ff63210a9..396ba659cfe 100644
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -5,6 +5,8 @@
 
 set -uex
 
+uncollapsed_section_start libdrm "Building libdrm"
+
 export LIBDRM_VERSION=libdrm-2.4.122
 
 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -15,3 +17,5 @@ meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled ${EX
 meson install -C build
 cd ..
 rm -rf "$LIBDRM_VERSION"
+
+section_end libdrm
diff --git a/.gitlab-ci/container/build-shader-db.sh b/.gitlab-ci/container/build-shader-db.sh
index 7cebcd8f2aa..0a6af9b63d2 100644
--- a/.gitlab-ci/container/build-shader-db.sh
+++ b/.gitlab-ci/container/build-shader-db.sh
@@ -6,9 +6,13 @@
 
 set -ex
 
+uncollapsed_section_start shader-db "Building shader-db"
+
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
 rm -rf shader-db/.git
 cd shader-db
 make
 popd
+
+section_end shader-db
diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index 4360b8731b7..e17f66bea8d 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -10,6 +10,8 @@
 
 set -uex
 
+uncollapsed_section_start skqp "Building skqp"
+
 SKQP_BRANCH=android-cts-12.1_r5
 
 SCRIPT_DIR="$(pwd)/.gitlab-ci/container"
@@ -98,3 +100,5 @@ popd
 rm -Rf "${SKIA_DIR}"
 
 set +ex
+
+section_end skqp
diff --git a/.gitlab-ci/container/build-va-tools.sh b/.gitlab-ci/container/build-va-tools.sh
index 3090f233204..0795c3f9585 100644
--- a/.gitlab-ci/container/build-va-tools.sh
+++ b/.gitlab-ci/container/build-va-tools.sh
@@ -6,6 +6,8 @@
 
 set -uex
 
+uncollapsed_section_start va-tools "Building va-tools"
+
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
@@ -23,3 +25,5 @@ meson setup build -D tests=true -Dprefix=/va ${EXTRA_MESON_ARGS:-}
 meson install -C build
 popd
 rm -rf /va-utils
+
+section_end va-tools