From 050d0e4443a0e6b528e3aec37a7a70655293ebb8 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Sun, 21 Feb 2021 02:15:05 +0000
Subject: [PATCH] Cirrus: Run "make clean" dry-run

---
 tools/cirrus_build_project.sh  |  5 +++++
 tools/rbm.local.conf.onetarget | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 tools/rbm.local.conf.onetarget

diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh
index e329e5e..59e8956 100755
--- a/tools/cirrus_build_project.sh
+++ b/tools/cirrus_build_project.sh
@@ -25,6 +25,8 @@ make submodule-update
 echo "Configuring rbm..."
 # Print logs to Cirrus.
 cat rbm.local.conf.example | sed "s/#build_log: '-'/build_log: '-'/g" > rbm.local.conf
+# Configure "make clean"
+cat tools/rbm.local.conf.onetarget | sed "s/CHANNEL/$CHANNEL/g" | sed "s/ncdns-all/ncdns-$OS-$ARCH/g" >> rbm.local.conf
 
 echo "Patching rbm..."
 pushd tor-browser-build
@@ -76,6 +78,9 @@ fi
 # debootstrap-images too.
 echo "Cleaning cache..."
 rm -rfv out/container-image
+if [[ "$SHOULD_BUILD" -eq 0 ]]; then
+    ./tools/clean-old --dry-run
+fi
 
 echo "Splitting caches..."
 rsync -avu --delete ./out/macosx-toolchain ./out_cache1/
diff --git a/tools/rbm.local.conf.onetarget b/tools/rbm.local.conf.onetarget
new file mode 100644
index 0000000..d349b4d
--- /dev/null
+++ b/tools/rbm.local.conf.onetarget
@@ -0,0 +1,14 @@
+
+var:
+  ### The clean configuration is used by the cleaning script to find the
+  ### branches and build targets you are using, to compute the list of
+  ### files that should be kept.
+  ###
+  ### If you only do alpha builds for all platforms, you can use the
+  ### following configuration:
+  clean:
+    HEAD:
+      - project: release
+        target:
+          - CHANNEL
+          - ncdns-all