summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-12-19 22:59:37 -0800
committerGitHub <noreply@github.com>2018-12-19 22:59:37 -0800
commit5dfb98ddd8f7c0adad4b2624f42d2c2be9049c6b (patch)
tree9f407f4fec6248d3f9c708f6135cb381f9ba503b
parent23ad804ea6e7d56b5318679fa9e300a0e9902c85 (diff)
parentb2e0781235f92ec3265df28008e790fea5c24202 (diff)
downloadchef-5dfb98ddd8f7c0adad4b2624f42d2c2be9049c6b.tar.gz
Merge pull request #8069 from chef/omnibus_cache_off_14
Disable s3 omnibus cache
-rw-r--r--omnibus/omnibus.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb
index dfbd2bc338..e839174138 100644
--- a/omnibus/omnibus.rb
+++ b/omnibus/omnibus.rb
@@ -29,11 +29,14 @@
env_omnibus_windows_arch = (ENV["OMNIBUS_WINDOWS_ARCH"] || "").downcase
env_omnibus_windows_arch = :x86 unless %w{x86 x64}.include?(env_omnibus_windows_arch)
-windows_arch env_omnibus_windows_arch
+windows_arch env_omnibus_windows_arch
# Disable git caching
+# caching is currently disabled as it causes issues when we're running
+# builds of different product versions on the same host. When forked to prep
+# for the next major release this has caused problems. To enable again:
# ------------------------------
-# use_git_caching false
+use_git_caching false
# Enable S3 asset caching
# ------------------------------