Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 15ab1e7

Browse files
committed
Avoid failing on Ruby 2.6 on Windows and Appveyor
Also avoid installing ffi 1.11.0 on Ruby 1.9.x Related: rspec/rspec-core#2651
1 parent e7d71df commit 15ab1e7

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Gemfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
2020
gem 'json', '< 2.0.0' # is a dependency of simplecov
2121
end
2222

23-
if RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
24-
gem 'ffi', '< 1.9.15' # allow ffi to be installed on older rubies on windows
25-
elsif RUBY_VERSION < '1.9'
26-
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
23+
if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
24+
gem 'ffi', '< 1.10'
2725
elsif RUBY_VERSION < '2.0'
28-
gem 'ffi', '< 1.11.0' # ffi dropped Ruby 1.9 support in 1.11.0
26+
# ffi dropped Ruby 1.8 support in 1.9.19 and Ruby 1.9 support in 1.11.0
27+
gem 'ffi', '< 1.9.19'
2928
else
30-
gem 'ffi', '~> 1.9.25'
29+
gem 'ffi', '~> 1.11.0'
3130
end
3231

3332
# No need to run rubocop on earlier versions

0 commit comments

Comments
 (0)