diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-04-01 13:14:54 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-04-01 13:14:54 -0700 |
| commit | bf89655ab95db568e2ae1ee6f3d2173023b79228 (patch) | |
| tree | b17b3046333e3c2ba8df2ae1168d795f13c4a2de | |
| parent | 84b836980d0964441f1a1d9b9f5fa5278ade6d90 (diff) | |
| download | chef-bf89655ab95db568e2ae1ee6f3d2173023b79228.tar.gz | |
Revert "Revert "bump to ruby 2.2.4""
This reverts commit c6c7a3b2d592dcddfcda42ef6793cd55bdcbd59d.
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -8,6 +8,9 @@ gem "chef-config", path: "chef-config" if File.exist?(File.expand_path("../chef- # Ensure that we can always install rake, regardless of gem groups gem "rake" +# we can go back to mainline when https://github.com/ffi/ffi/pull/490 is merged +gem "ffi", github: "lamont-granquist/ffi", branch: "lcg/rb_gc_guard_ptr" if RUBY_PLATFORM.downcase =~ /aix/ + group(:docgen) do gem "yard" end diff --git a/appveyor.yml b/appveyor.yml index d6459b6b96..38c9e8be82 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ environment: matrix: # 21-x64 is failing right now #- ruby_version: "21-x64" - - ruby_version: "21" + - ruby_version: "22" clone_folder: c:\projects\chef clone_depth: 1 diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index a5de689927..ae27cac435 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -34,7 +34,7 @@ else install_dir "#{default_root}/#{name}" end -override :ruby, version: "2.1.8" +override :ruby, version: "2.2.4" # 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? |