From 477c81863131cd5665b1bccb7cc2d4fa32f3dfd3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 24 Nov 2019 00:35:12 +0100 Subject: [PATCH] adding git gc to cargo-induced git checkouts. This avoids problems with dangling commits. --- ci_scripts/remote_tests_python.sh | 2 ++ ci_scripts/remote_tests_rust.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 49ab46453..039dc37fe 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -25,6 +25,8 @@ echo "--- Running $CIRCLE_JOB remotely" ssh $SSHTARGET <<_HERE set +x -e cd $BUILDDIR + # make sure git checkouts are clean (no dangling revspcs) + cargo cache --gc # let's share the target dir with our last run on this branch/job-type # cargo will make sure to block/unblock us properly export CARGO_TARGET_DIR=\`pwd\`/../target diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh index d9d9c7080..319cecfe8 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/ci_scripts/remote_tests_rust.sh @@ -21,6 +21,8 @@ echo "--- Running $CIRCLE_JOB remotely" ssh $SSHTARGET <<_HERE set +x -e cd $BUILDDIR + # make sure git checkouts are clean (no dangling revspecs) + cargo cache --gc # let's share the target dir with our last run on this branch/job-type # cargo will make sure to block/unblock us properly export CARGO_TARGET_DIR=\`pwd\`/../target