From 737d2b704b89e98caee6d6a546090174085a8baf Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 7 Nov 2020 09:25:37 -0800 Subject: [PATCH] ci: Move the rust cleanup in lava_build out of the middle of kernel build. Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci/container/lava_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index f60c1eda136..1d2be14cd22 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -143,9 +143,6 @@ mkdir -p kernel wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C kernel pushd kernel -############### Delete rust, since the tests won't be compiling anything. -rm -rf /root/.rustup /root/.cargo - # The kernel doesn't like the gold linker (or the old lld in our debians). # Sneak in some override symlinks during kernel build until we can update # debian (they'll get blown away by the rm of the kernel dir at the end). @@ -188,6 +185,9 @@ fi popd rm -rf kernel +############### Delete rust, since the tests won't be compiling anything. +rm -rf /root/.rustup /root/.cargo + ############### Create rootfs set +e debootstrap \