From e2a8aac2b03e0a792688ffbb61648c1c72a7be6b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 29 Sep 2022 19:30:05 +0530 Subject: [PATCH] ci/windows: Remove cargo-vendor sources from the cerbero source cache Copying the source cache to a running Cerbero CI job on Windows causes strange / corrupted errors that talk about hard links like: ++ cp -a C:/cerbero/cerbero-sources . cp: will not create hard link `./cerbero-sources/gstreamer-1.0/subprojects/gst-plugins-good/sys/osxaudio' to directory `./cerbero-sources/cargo-c-0.9.12/cargo-vendor/adler/benches' [...] So, delete it. The vendored sources are cached by cargo in its own cache inside CARGO_HOME, which is build/rust/cargo/ and is preserved in the image. We won't need to redownload any of this. Part-of: --- ci/docker/windows/prepare_cerbero_env.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/docker/windows/prepare_cerbero_env.sh b/ci/docker/windows/prepare_cerbero_env.sh index 21d55b86fb..eaaf87bf36 100644 --- a/ci/docker/windows/prepare_cerbero_env.sh +++ b/ci/docker/windows/prepare_cerbero_env.sh @@ -23,5 +23,7 @@ echo 'vs_install_version = "vs16"' >> localconf.cbc # Wipe visualstudio package dist, sources, logs, and the build tools recipes ./cerbero-uninstalled -t -v visualstudio -c localconf.cbc -c config/win64.cbc wipe --force --build-tools +# Vendored sources get confused with hard links +rm -rvf /c/cerbero/cerbero-sources/*/cargo-vendor # clean the localconf -rm /c/cerbero/localconf.cbc +rm -v /c/cerbero/localconf.cbc