diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-23 15:55:32 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-23 15:55:32 -0700 |
| commit | 3cb10016d142c45d5b2409ecb337b1b7bc295046 (patch) | |
| tree | 54e49f43233efd7f5744a7e6c57e66c9dbb83a5d | |
| parent | 53b4ae6633b3d2e4e9e285bd40b399b40cc23b81 (diff) | |
| download | chef-3cb10016d142c45d5b2409ecb337b1b7bc295046.tar.gz | |
bump to ruby 2.2.4
the ffi branch is necessary for AIX until that patch is merged.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -8,6 +8,8 @@ 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" +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? |