summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-09-06 15:30:21 +0600
committerJohn McCrae <john.mccrae@progress.com>2022-09-06 15:30:21 +0600
commitd5b420224a91b4f9eb81b4e85f574068dc25db74 (patch)
treede61ba1cfc35abde86926db2c4795ebdd28329ba
parentaf2813a5fe1ce014967ad7833075ac5bf831b8d4 (diff)
downloadchef-jfm/chef18_rc1_take2.tar.gz
Attempting to solve problems with mixlib-archive failing to load on Windowsjfm/chef18_rc1_take2
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--Gemfile3
-rw-r--r--chef.gemspec2
2 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 052b21cf6b..091fdba685 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,9 @@ 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"
+# needed to update the platform here to ensure this loads.
+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 fa9d620938..3c0918236a 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"