Skip to content

Commit d04a42d

Browse files
authored
Merge pull request #2707 from joshcooper/ffi_bump
(FACT-3434) Accept ffi >= 1.16.3, < 1.17.0
2 parents 27e94e7 + 9ef20e5 commit d04a42d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ gem 'packaging', require: false
1313
local_gemfile = File.expand_path('Gemfile.local', __dir__)
1414
eval_gemfile(local_gemfile) if File.exist?(local_gemfile)
1515

16-
# ffi >= 1.16.0 introduces breaking changes, so we pin to the version prior
17-
# for now
1816
group(:integration, optional: true) do
19-
gem 'ffi', '1.15.5', require: false
17+
# 1.16.0 - 1.16.2 are broken on Windows
18+
gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', require: false
2019
end
2120

2221
group(:documentation) do

Diff for: facter.gemspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
3434
# or indirectly contain native extensions. The intent behind excluding these
3535
# gems from runtime dependencies is to allow users to be able to install
3636
# Facter without a compiler.
37-
spec.add_development_dependency 'ffi', '1.15.5'
37+
# ffi 1.16.0 - 1.16.2 are broken on Windows
38+
spec.add_development_dependency 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2'
3839
spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
3940
spec.add_development_dependency 'rspec', '~> 3.0'
4041
spec.add_development_dependency 'rubocop', '~> 1.28' # last version to support 2.5

0 commit comments

Comments
 (0)