diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-19 14:25:00 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-19 14:25:00 -0700 |
| commit | f8739b2257305db85644b21735da71e46a00fbfb (patch) | |
| tree | f98273f45a12bb809986c55050454a803b4af284 | |
| parent | 7a5efc4a556bdea0195a970295856466118f0d08 (diff) | |
| parent | b64809895f6765417d5959403597bc1ad26b7068 (diff) | |
| download | chef-f8739b2257305db85644b21735da71e46a00fbfb.tar.gz | |
Merge pull request #4843 from chef/jk/unfreeze-windows
Refreeze windows
| -rw-r--r-- | omnibus/files/chef/build-chef.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/omnibus/files/chef/build-chef.rb b/omnibus/files/chef/build-chef.rb index e0e0d9928d..6ff9ca755a 100644 --- a/omnibus/files/chef/build-chef.rb +++ b/omnibus/files/chef/build-chef.rb @@ -122,10 +122,7 @@ module BuildChef bundle "lock", env: shared_gemfile_env # Freeze the location's Gemfile.lock. - # TODO Windows cannot be frozen, because Bundler doesn't understand platform-specific - # versions. However, on Windows we have explicit version pins for most things, so - # we will *probably* get the exact versions of everything we want. - create_bundle_config(shared_gemfile, frozen: !windows?) + create_bundle_config(shared_gemfile, frozen: true) # Clear the now-unnecessary git caches, cached gems, and git-checked-out gems block "Delete bundler git cache and git installs" do |