From b791074f2e2ff055b925c5f58763f951f9392c43 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:14:21 +0100 Subject: [PATCH] ci/container: move rust build section into the script itself Part-of: --- .gitlab-ci/container/build-rust.sh | 4 ++++ .gitlab-ci/container/debian/test-base.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 298a1d6fd56..344327adfeb 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -5,6 +5,8 @@ set -ex +uncollapsed_section_start rust "Building Rust toolchain" + # cargo (and rustup) wants to store stuff in $HOME/.cargo, and binaries in # $HOME/.cargo/bin. Make bin a link to a public bin directory so the commands # are just available to all build jobs. @@ -34,3 +36,5 @@ linker = "arm-linux-gnueabihf-gcc" [target.aarch64-unknown-linux-gnu] linker = "aarch64-linux-gnu-gcc" EOF + +section_end rust diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 62b3128b107..c3989d565c9 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -155,8 +155,6 @@ uncollapsed_section_switch wayland "Building Wayland" ############### Install Rust toolchain -uncollapsed_section_switch rust "Installing Rust toolchain" - . .gitlab-ci/container/build-rust.sh ############### Build Crosvm