Skip to content

Commit e1c1b2d

Browse files
authored
Merge pull request #9342 from AriaXLi/backport_FACT-3434
[Backport 7.x] (FACT-3434) Accept ffi >= 1.16.3, < 1.17.0
2 parents 858752f + cc73049 commit e1c1b2d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ group(:features) do
4040
end
4141

4242
group(:test) do
43-
gem "ffi", '1.15.5', require: false
43+
# 1.16.0 - 1.16.2 are broken on Windows
44+
gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', require: false
4445
gem "json-schema", "~> 2.0", require: false
4546
gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
4647
gem "rspec", "~> 3.1", require: false

puppet.gemspec

+5-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ Gem::Specification.new do |s|
3838
s.add_runtime_dependency('CFPropertyList', '~> 2.2')
3939
end
4040

41-
if platform == 'x64-mingw32' || platform == 'x86-mingw32'
42-
s.add_runtime_dependency('ffi', '1.15.5')
43-
s.add_runtime_dependency('minitar', '~> 0.9')
44-
end
41+
if platform == 'x64-mingw32' || platform == 'x86-mingw32'
42+
# ffi 1.16.0 - 1.16.2 are broken on Windows
43+
s.add_runtime_dependency('ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2')
44+
s.add_runtime_dependency('minitar', '~> 0.9')
45+
end
4546
end

0 commit comments

Comments
 (0)