From a5af6e8ef4c7e1705a723bdeead6b802d4aedfdc Mon Sep 17 00:00:00 2001 From: commitay Date: Mon, 3 Sep 2018 18:59:53 +1000 Subject: [PATCH 1/2] formula: set `CARGO_HOME` to enable cache --- Library/Homebrew/formula.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index af2c449d7e..e1e5262fe0 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1680,6 +1680,7 @@ class Formula HOMEBREW_PATH: nil, _JAVA_OPTIONS: "#{ENV["_JAVA_OPTIONS"]} -Duser.home=#{HOMEBREW_CACHE}/java_cache", GOCACHE: "#{HOMEBREW_CACHE}/go_cache", + CARGO_HOME: "#{HOMEBREW_CACHE}/cargo_cache", } ENV.clear_sensitive_environment! @@ -2034,6 +2035,7 @@ class Formula stage_env[:_JAVA_OPTIONS] = "#{ENV["_JAVA_OPTIONS"]} -Duser.home=#{HOMEBREW_CACHE}/java_cache" stage_env[:GOCACHE] = "#{HOMEBREW_CACHE}/go_cache" + stage_env[:CARGO_HOME] = "#{HOMEBREW_CACHE}/cargo_cache" stage_env[:CURL_HOME] = ENV["CURL_HOME"] || ENV["HOME"] end From 11a6413fd01dfb83d59aeb7c242f16cf7e37d6b6 Mon Sep 17 00:00:00 2001 From: commitay Date: Mon, 3 Sep 2018 18:59:53 +1000 Subject: [PATCH 2/2] cleanup: remove cargo_cache --- Library/Homebrew/cleanup.rb | 2 +- Library/Homebrew/test/cleanup_spec.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb index e88aff4076..852b6126bb 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -36,7 +36,7 @@ module CleanupRefinement end def nested_cache? - directory? && %w[go_cache glide_home java_cache npm_cache gclient_cache].include?(basename.to_s) + directory? && %w[cargo_cache go_cache glide_home java_cache npm_cache gclient_cache].include?(basename.to_s) end def go_cache_directory? diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb index 18c0c9e51a..b4f4de58d0 100644 --- a/Library/Homebrew/test/cleanup_spec.rb +++ b/Library/Homebrew/test/cleanup_spec.rb @@ -225,6 +225,15 @@ describe Homebrew::Cleanup do expect(incomplete).not_to exist end + it "cleans up 'cargo_cache'" do + cargo_cache = (HOMEBREW_CACHE/"cargo_cache") + cargo_cache.mkpath + + subject.cleanup_cache + + expect(cargo_cache).not_to exist + end + it "cleans up 'go_cache'" do go_cache = (HOMEBREW_CACHE/"go_cache") go_cache.mkpath