Skip to content

Commit 1d188e1

Browse files
authored
Merge pull request #9330 from joshcooper/ffi_bump
Accept ffi >= 1.16.3, < 1.17.0
2 parents fa213f5 + aa51340 commit 1d188e1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ group(:features) do
3939
end
4040

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

puppet.gemspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Gem::Specification.new do |s|
3838
end
3939

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

0 commit comments

Comments
 (0)