diff options
author | John McCrae <john.mccrae@progress.com> | 2022-06-29 07:18:28 -0700 |
---|---|---|
committer | Thomas Powell <powell@progress.com> | 2022-08-23 11:08:51 -0400 |
commit | 2f5dbd1ee69c970fc06870477dbbca6c5c3555c4 (patch) | |
tree | de0dcdb7b443306b000d71f70d54bb08ff2d2e6f /Gemfile | |
parent | 964236952f9fad2398a6a3a2501774e430b17b6d (diff) | |
download | chef-2f5dbd1ee69c970fc06870477dbbca6c5c3555c4.tar.gz |
Integrate ruby 3.1 into builds
This is a combination of 64 commits, the originals were mostly
repeating one-line messages so that history has not been kept here.
Signed-off-by: Thomas Powell <thomas.powell@progress.com>
Signed-off-by: Marc Paradise <marc@chef.io>
Signed-off-by: John McCrae <john.mccrae@progress.com>
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -4,6 +4,10 @@ gem "chef", path: "." gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" +# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update. +gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" + +gem "ffi", ">= 1.15.5" gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__)) gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__)) @@ -20,7 +24,7 @@ gem "cheffish", ">= 17" group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "inspec-core-bin", "~> 4.24" # need to provide the binaries for inspec + gem "inspec-core-bin", ">= 5" # need to provide the binaries for inspec gem "chef-vault" end @@ -39,7 +43,7 @@ gem "proxifier", git: "https://github.com/chef/ruby-proxifier", branch: "lcg/rub # Everything except AIX and Windows group(:ruby_shadow) do # if ruby-shadow does a release that supports ruby-3.0 this can be removed - gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby + gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby unless RUBY_PLATFORM == "x64-mingw-ucrt" end # deps that cannot be put in the knife gem because they require a compiler and fail on windows nodes @@ -54,10 +58,11 @@ group(:development, :test) do gem "fauxhai-ng" # for chef-utils gem end -group(:chefstyle) do - # for testing new chefstyle rules - gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main" -end +gem "chefstyle" +# group(:chefstyle) do +# # for testing new chefstyle rules +# gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main" +# end instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] |