Mesa (master): ci: Move the rust cleanup in lava_build out of the middle of kernel build.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 11 17:41:17 UTC 2020
Module: Mesa
Branch: master
Commit: 737d2b704b89e98caee6d6a546090174085a8baf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=737d2b704b89e98caee6d6a546090174085a8baf
Author: Eric Anholt <eric at anholt.net>
Date: Sat Nov 7 09:25:37 2020 -0800
ci: Move the rust cleanup in lava_build out of the middle of kernel build.
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6971>
---
.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 \
More information about the mesa-commit
mailing list