Merge pull request #9342 from AriaXLi/backport_FACT-3434

[Backport 7.x] (FACT-3434) Accept ffi >= 1.16.3, < 1.17.0
puppetlabs · May 9, 2024 · e1c1b2d · e1c1b2d
2 parents 858752f + cc73049
commit e1c1b2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,7 +40,8 @@ group(:features) do
 end
 
 group(:test) do
-  gem "ffi", '1.15.5', require: false
+  # 1.16.0 - 1.16.2 are broken on Windows
+  gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', require: false
   gem "json-schema", "~> 2.0", require: false
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
   gem "rspec", "~> 3.1", require: false

diff --git a/puppet.gemspec b/puppet.gemspec
@@ -38,8 +38,9 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency('CFPropertyList', '~> 2.2')
   end
 
-  if platform == 'x64-mingw32' || platform == 'x86-mingw32'
-    s.add_runtime_dependency('ffi', '1.15.5')
-    s.add_runtime_dependency('minitar', '~> 0.9')
-  end
+    if platform == 'x64-mingw32' || platform == 'x86-mingw32'
+      # ffi 1.16.0 - 1.16.2 are broken on Windows
+      s.add_runtime_dependency('ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2')
+      s.add_runtime_dependency('minitar', '~> 0.9')
+    end
 end