From 999cc1a86fa01528544f3b190bc418c835e96d94 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:11:10 +0100 Subject: [PATCH] ci/container: move ninetests build section into the script itself Part-of: --- .gitlab-ci/container/build-ninetests.sh | 4 ++++ .gitlab-ci/container/debian/test-gl.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-ninetests.sh b/.gitlab-ci/container/build-ninetests.sh index 4e2d6178ae3..9e9b9f03f3d 100644 --- a/.gitlab-ci/container/build-ninetests.sh +++ b/.gitlab-ci/container/build-ninetests.sh @@ -6,6 +6,8 @@ set -ex -o pipefail +uncollapsed_section_start ninetests "Building Nine tests" + ### Careful editing anything below this line git config --global user.email "mesa@example.com" @@ -23,3 +25,5 @@ mv NineTests/NineTests /NineTests/ popd rm -rf /Xnine + +section_end ninetests diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh index 98c9469cbed..0fee8756d5a 100644 --- a/.gitlab-ci/container/debian/test-gl.sh +++ b/.gitlab-ci/container/debian/test-gl.sh @@ -124,8 +124,6 @@ uncollapsed_section_switch vvl "Building Vulkan validation layers" ############### Build nine tests -uncollapsed_section_switch nine "Building Nine tests" - . .gitlab-ci/container/build-ninetests.sh ############### Uninstall the build software