From a824381408c04d6a03856275b888b5b05377f4aa Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:04:19 +0100 Subject: [PATCH] ci/container: move deqp-runner build section into the script itself Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 4 ++++ .gitlab-ci/container/debian/test-base.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index dfb17d443a3..e6f764949ab 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -9,6 +9,8 @@ set -uex +uncollapsed_section_start deqp-runner "Building deqp-runner" + DEQP_RUNNER_VERSION=0.20.2 commits_to_backport=( @@ -94,3 +96,5 @@ popd if [ -z "${DEQP_RUNNER_GIT_TAG:-}${DEQP_RUNNER_GIT_REV:-}" ]; then rm -f /usr/local/bin/igt-runner fi + +section_end deqp-runner diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 38f814e890a..276cad251ae 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -171,8 +171,6 @@ uncollapsed_section_switch rust "Installing Rust toolchain" ############### Build dEQP runner -uncollapsed_section_switch deqpr "Building deqp-runner" - . .gitlab-ci/container/build-deqp-runner.sh ############### Uninstall the build software