summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalim Alam <salam@chef.io>2016-03-31 17:59:45 -0700
committerSalim Alam <salam@chef.io>2016-03-31 17:59:45 -0700
commitc6c7a3b2d592dcddfcda42ef6793cd55bdcbd59d (patch)
treed7a88b734f9b9cb020f459460b75ebfab7e2e8bf
parent447fa94476fe4a9c8b01b1f3a2033702f134b79a (diff)
downloadchef-c6c7a3b2d592dcddfcda42ef6793cd55bdcbd59d.tar.gz
Revert "bump to ruby 2.2.4"salam/ruby-21
This reverts commit 3cb10016d142c45d5b2409ecb337b1b7bc295046.
-rw-r--r--Gemfile3
-rw-r--r--appveyor.yml2
-rw-r--r--omnibus/config/projects/chef.rb2
3 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index f1d3168ad8..e39a50a586 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,9 +8,6 @@ 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 38c9e8be82..d6459b6b96 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: "22"
+ - ruby_version: "21"
clone_folder: c:\projects\chef
clone_depth: 1
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index ae27cac435..a5de689927 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.2.4"
+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?