diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-06-09 22:37:27 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-06-09 22:37:27 -0700 |
| commit | 175abc6975ad03dbdbc08b99ec7d5c23e42fd9a2 (patch) | |
| tree | 91a95e10f74bcdd336961478cd4e941bb0147b0c | |
| parent | 4be3d8d01e9b757444d8e374ac0a541a68f75dab (diff) | |
| download | chef-175abc6975ad03dbdbc08b99ec7d5c23e42fd9a2.tar.gz | |
Test build to see if ffi 1.13.1 works
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile.lock | 29 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fec8aa09c2..8d911f08e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 0e9ee45a766c84f9c5cfb867fbeb85c092121f37 + revision: 309b638d8434b8a98f7c54329947ea11c8373ef4 branch: master specs: - chefstyle (1.1.0) - rubocop (= 0.85.0) + chefstyle (1.1.1) + rubocop (= 0.85.1) GIT remote: https://github.com/chef/ohai.git @@ -39,7 +39,7 @@ PATH diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25, < 1.13) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -73,7 +73,7 @@ PATH diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25, < 1.13) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -177,9 +177,9 @@ GEM multipart-post (>= 1.2, < 3) fauxhai-ng (8.2.0) net-ssh - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) - ffi (1.12.2-x86-mingw32) + ffi (1.13.1) + ffi (1.13.1-x64-mingw32) + ffi (1.13.1-x86-mingw32) ffi-libarchive (1.0.0) ffi (~> 1.0) ffi-win32-extensions (1.0.3) @@ -260,8 +260,8 @@ GEM multi_json (1.14.1) multipart-post (2.1.1) necromancer (0.5.1) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (5.2.0) @@ -297,7 +297,7 @@ GEM rainbow (3.0.0) rake (13.0.1) rb-readline (0.5.5) - regexp_parser (1.7.0) + regexp_parser (1.7.1) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -318,7 +318,7 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.85.0) + rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) @@ -353,12 +353,11 @@ GEM tins (1.25.0) sync tomlrb (1.3.0) - train-core (3.2.37) + train-core (3.2.28) addressable (~> 2.5) - ffi (< 1.13) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 4.0) + net-scp (>= 1.2, < 3.0) net-ssh (>= 2.9, < 6.0) train-winrm (0.2.6) winrm (~> 2.0) diff --git a/chef.gemspec b/chef.gemspec index e99d9e9e83..f72d091d60 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 16.0" - s.add_dependency "ffi", ">= 1.9.25", "< 1.13" # https://github.com/ffi/ffi/issues/784 + s.add_dependency "ffi", ">= 1.9.25" s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "net-ssh", ">= 4.2", "< 6" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" |