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

Change ffi pinning

Browse source 
ffi 1.13.1 reverts the breaking change in 1.13.0
We can now use any version other than specifically 1.13.0.

Signed-off-by: James Stocks <jstocks@chef.io>
This commit is contained in:
James Stocks 2020-06-10 12:11:50 +01:00
parent 705d0ffbb6
commit 8ee28c1211
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -9,7 +9,7 @@ gem "inspec", path: "."
# in it in order to package the executable. Hence the odd backwards dependency. # in it in order to package the executable. Hence the odd backwards dependency.
gem "inspec-bin", path: "./inspec-bin" gem "inspec-bin", path: "./inspec-bin"
gem "ffi", [">= 1.9.14", "< 1.13"] # 1.13 does not work on Windows: https://github.com/ffi/ffi/issues/784 gem "ffi", ">= 1.9.14", "!= 1.13.0"
group :omnibus do group :omnibus do
gem "rb-readline" gem "rb-readline"

4
omnibus/Gemfile
View file

@ -1,11 +1,11 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "ffi", [">= 1.9.14", "< 1.13"] # 1.13 does not work on Windows: https://github.com/ffi/ffi/issues/784
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
gem "artifactory" gem "artifactory"
gem "ffi", ">= 1.9.14", "!= 1.13.0"
# This development group is installed by default when you run `bundle install`, # This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need # but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies # the Test Kitchen-based build lab. You can skip these unnecessary dependencies