Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-26 22:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bundle install on Ruby 2.1.9

Browse source
This commit is contained in:
John Keiser 2016-08-24 09:52:28 -07:00 committed by Christoph Hartmann
parent d4ec3214d2
commit 2b37bd6586
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -16,6 +16,7 @@ matrix:
include: include:
- rvm: 1.9.3 - rvm: 1.9.3
- rvm: 2.0 - rvm: 2.0
- rvm: 2.1.8
- rvm: 2.2 - rvm: 2.2
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE="lint test test:functional" env: SUITE="lint test test:functional"

3
Gemfile
View file

@ -8,8 +8,9 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
gem 'net-ssh', '~> 2.9' gem 'net-ssh', '~> 2.9'
end end
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.1.0') if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
gem 'json', '~> 1.8' gem 'json', '~> 1.8'
gem 'rack', '< 2.0'
end end
# TODO: ffi 1.9.11 is currently erroneous on windows tests # TODO: ffi 1.9.11 is currently erroneous on windows tests