diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-25 12:11:39 -0500 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-27 16:59:22 -0500 |
| commit | 1994fdd88e478d3961449d1be51e6f8a802b5e1d (patch) | |
| tree | 108066311644dd478c5b40506c34e6d6a788d386 | |
| parent | 24d013550c1b9e8b21dd1136b080c716f231b2ac (diff) | |
| download | chef-1994fdd88e478d3961449d1be51e6f8a802b5e1d.tar.gz | |
Update chef and chef-fips to use the new ruby version defaults
| -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 ###### |