From 33ea8d3b8192e93774fd93bc4823b8c2109830fb Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:28:16 +0100 Subject: [PATCH] ci/container: move crosvm build section into the script itself Part-of: --- .gitlab-ci/container/build-crosvm.sh | 4 ++++ .gitlab-ci/container/debian/test-base.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 37d2a46b7e9..45e49741b31 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -3,6 +3,8 @@ set -uex +uncollapsed_section_start crosvm "Building crosvm" + git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" @@ -42,3 +44,5 @@ CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L nati popd rm -rf /platform/crosvm + +section_end crosvm diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 1d7a642692d..38f814e890a 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -167,7 +167,6 @@ uncollapsed_section_switch rust "Installing Rust toolchain" ############### Build Crosvm -uncollapsed_section_switch crosvm "Building crosvm" . .gitlab-ci/container/build-crosvm.sh ############### Build dEQP runner