diff options
| -rw-r--r-- | omnibus/config/projects/chef-fips.rb | 2 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb index 37410b0e49..6ae30e3a28 100644 --- a/omnibus/config/projects/chef-fips.rb +++ b/omnibus/config/projects/chef-fips.rb @@ -36,7 +36,7 @@ end # Global FIPS override flag. override :fips, enabled: true -override :'ruby-windows', version: "2.0.0-p647" +override :ruby, version: "2.1.7" override :chef, version: "local_source" override :ohai, version: "master" diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 1c9d647f16..6c436907d5 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -33,13 +33,16 @@ else end override :bundler, version: "1.10.6" -override :ruby, version: "2.1.6" -override :'ruby-windows', version: "2.0.0-p645" -# Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want -# to unnecessarily make the client any fatter. -if windows_arch_i386? - override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" +if windows? + override :'ruby-windows', version: "2.0.0-p645" + # Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want + # to unnecessarily make the client any fatter. + if windows_arch_i386? + override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" + end +else + override :ruby, version: "2.1.6" end ###### |