Allow Windows to freeze

2 files changed, 3 insertions, 4 deletions

diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index ce79c5cd1d..fa6f30b322 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -45,6 +45,8 @@ end
 overrides_path = File.expand_path("../../../../omnibus_overrides.rb", __FILE__)
 instance_eval(IO.read(overrides_path), overrides_path)
 
+override :"ruby-windows-devkit", version: "4.5.2-20111229-1559" if windows? && windows_arch_i386?
+
 dependency "preparation"
 
 # All actual dependencies are in chef-complete, so that the addition
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index 866694c894..4b4e9c2850 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -63,10 +63,7 @@ build do
   # Prepare to install: build config, retries, job, frozen=true
   # TODO Windows install seems to sometimes install already-installed gems such
   # as gherkin (and fail as a result) if you use jobs > 1.
-  # 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(chef_gemfile, retries: 4, jobs: windows? ? 1 : 7, frozen: !windows?)
+  create_bundle_config(chef_gemfile, retries: 4, jobs: windows? ? 1 : 7, frozen: true)
 
   # Install all the things. Arguments are specified in .bundle/config (see create_bundle_config)
   block { log.info(log_key) { "" } }