From: teor <teor@torproject.org>
Date: Mon, 1 Apr 2019 04:05:14 +0000 (+1000)
Subject: Travis: merge before_cache from 29036 and 29962
X-Git-Tag: tor-0.4.0.4-rc~14^2^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33be8d8295415491fc06bee47729e86d9efcd126;p=thirdparty%2Ftor.git

Travis: merge before_cache from 29036 and 29962

And add some useful comments
---

diff --git a/.travis.yml b/.travis.yml
index 4b2a1ffd7a..ed805aac31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ cache:
   ## cargo: true
   directories:
     - $HOME/.cargo
-
-before_cache:
-  - rm -rf $HOME/.cargo/registry
+    ## caching CARGO_TARGET_DIR actually slows down the build over time,
+    ## because old build products are never deleted.
+    ## where we point CARGO_TARGET_DIR in all our cargo invocations
+    #- $TRAVIS_BUILD_DIR/src/rust/target
 
 compiler:
   - gcc
@@ -217,6 +218,9 @@ after_failure:
 before_cache:
   ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
+  ## Delete the cargo registry before caching .cargo, because it's cheaper to
+  ## download the registry and throw it away, rather than caching it
+  - rm -rf $HOME/.cargo/registry
 
 notifications:
   irc: