From 500c1c2d7c1ceec4ae0c1557467ce88f78377b69 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:10:32 +0100 Subject: [PATCH] ci/container: move mold build section into the script itself Part-of: --- .gitlab-ci/container/build-mold.sh | 4 ++++ .gitlab-ci/container/debian/test-base.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh index d8690c8fe6d..6ca90eb831f 100644 --- a/.gitlab-ci/container/build-mold.sh +++ b/.gitlab-ci/container/build-mold.sh @@ -10,6 +10,8 @@ set -ex # FEDORA_X86_64_BUILD_TAG # KERNEL_ROOTFS_TAG +uncollapsed_section_start mold "Building mold" + MOLD_VERSION="2.32.0" git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git @@ -26,3 +28,5 @@ find /usr/bin \( -name '*-ld' -o -name 'ld' \) \ popd rm -rf mold + +section_end mold diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index b8bf006b601..62b3128b107 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -137,8 +137,6 @@ fi ############### Build mold -uncollapsed_section_switch mold "Building mold linker" - . .gitlab-ci/container/build-mold.sh ############### Build LLVM-SPIRV translator