From f15eba0ec1e33a60236ebc864d10e662278c5d90 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Thu, 3 Mar 2016 12:37:21 -0800 Subject: Use ruby 2.1.8 on both windows and unix --- omnibus/config/projects/chef.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 779a2b3a5e..1b6e373725 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -34,17 +34,10 @@ else install_dir "#{default_root}/#{name}" end -if windows? - override :ruby, 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 - +override :ruby, version: "2.1.8" +# 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. +override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" if windows? && windows_arch_i386? override :bundler, version: "1.11.2" override :rubygems, version: "2.5.2" -- cgit v1.2.1