diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-09-06 12:02:35 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-09-06 12:02:35 +0600 |
| commit | 9b839f26ecae73b7f739678d347eaec098449bbe (patch) | |
| tree | 6be152c445e0ba82cfe0fa3a90bafb6e26031097 | |
| parent | d79ebce318f2e6c30e119ce080a64ba67625cebd (diff) | |
| download | chef-9b839f26ecae73b7f739678d347eaec098449bbe.tar.gz | |
reverting the libarchive gem
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -7,9 +7,6 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" # Need 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" -# Testing a new mixlib-arthive gem to get it working on Windows properly -gem "mixlib-archive", git: "https://github.com/chef/mixlib-archive", 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__)) diff --git a/chef.gemspec b/chef.gemspec index 844dc87ff1..2a709da296 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -52,7 +52,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0" s.add_dependency "mixlib-authentication", ">= 2.1", "< 4" s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0" - # s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" + s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 18.0" s.add_dependency "inspec-core", ">= 5" |