From 7051769c46cd8735dc2d927dfaef99e2eed1f968 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Mon, 29 Mar 2021 09:47:05 +0000
Subject: [PATCH] Cirrus: Only run ./tools/clean-old on download task

Fixes https://github.com/namecoin/ncdns-repro/issues/98
---
 tools/cirrus_build_project.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh
index 8293624..d87f71b 100755
--- a/tools/cirrus_build_project.sh
+++ b/tools/cirrus_build_project.sh
@@ -43,6 +43,12 @@ else
     echo "Checking if project is cached..."
     OUTDIR="$(./rbm/rbm showconf $PROJECT output_dir --target $CHANNEL --target ncdns-$OS-$ARCH)"
     OUTFILE="$(./rbm/rbm showconf $PROJECT filename --target $CHANNEL --target ncdns-$OS-$ARCH)"
+
+    if [[ "$SHOULD_BUILD" -eq 0 ]]; then
+        echo "Cleaning old outputs..."
+        ./tools/clean-old
+    fi
+
     if [[ -e "$OUTDIR/$OUTFILE" ]]; then
         echo "Project cache hit, skipping build."
         SHOULD_BUILD=0
@@ -83,11 +89,8 @@ fi
 # container-images are very large and seem to be fairly harmless to remove.
 # Maybe later if we have more pressure to shrink, we could remove the
 # debootstrap-images too.
-echo "Cleaning cache..."
+echo "Cleaning containers..."
 rm -rfv out/container-image
-if [[ "$SHOULD_BUILD" -eq 0 ]]; then
-    ./tools/clean-old
-fi
 
 echo "Splitting caches..."
 rsync -avu --delete ./out/macosx-toolchain ./out_cache1/ || true