summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-12-19 22:59:24 -0800
committerGitHub <noreply@github.com>2018-12-19 22:59:24 -0800
commit4d5ba6e87038163eb94ea577d8cf7d84f59af515 (patch)
tree8e383369dfff9d78c8dce30dd39da0e510fbf605
parent3a58b039ed22db355a8a7868f73d69ad466c8789 (diff)
parent6ab7c92b884924505892b66e6f739534d83ad71a (diff)
downloadchef-4d5ba6e87038163eb94ea577d8cf7d84f59af515.tar.gz
Merge pull request #8068 from chef/cache_off_master
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
# ------------------------------