From 07de2140a3be83ead4e55e54040984c5fd8f8c0d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 19:32:33 +0100 Subject: [PATCH] ci/container: move apitrace build section into the script itself Part-of: --- .gitlab-ci/container/build-apitrace.sh | 4 ++++ .gitlab-ci/container/debian/test-vk.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh index 89233049b02..903fb734721 100644 --- a/.gitlab-ci/container/build-apitrace.sh +++ b/.gitlab-ci/container/build-apitrace.sh @@ -9,6 +9,8 @@ set -uex +uncollapsed_section_start apitrace "Building apitrace" + APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a" git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace @@ -23,3 +25,5 @@ cp _build/eglretrace build ${STRIP_CMD:-strip} build/* find . -not -path './build' -not -path './build/*' -delete popd + +section_end apitrace diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index fbdf2ba7468..94b60e3de7e 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -110,8 +110,6 @@ DEQP_TARGET=default \ ############### Build apitrace -uncollapsed_section_switch apitrace "Building apitrace" - . .gitlab-ci/container/build-apitrace.sh ############### Build Fossilize