diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-06-04 11:26:44 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-06-04 11:26:44 -0700 |
| commit | efbe77f96d8eaaba7dc7bfe4d1c80704e55496e3 (patch) | |
| tree | b8ec157f6df7e971949c39f441851cf172f486f6 | |
| parent | 22db8167d08f2af0cc3d30a0cd48410f7b25e5fa (diff) | |
| download | chef-expeditor/inspec-core-bin_4.19.2.tar.gz | |
Pin FFI to < 1.13 to avoid failures on Windowsexpeditor/inspec-core-bin_4.19.2
FFI 1.13 is more strict now and others using it have been abusing it historically on Windows. This results in failures with the new version. We need to let the dust settle before we can use 1.13.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 15 |
3 files changed, 14 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ab128f35fc..1df0306eba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,7 +39,7 @@ PATH diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (~> 1.9, >= 1.9.25) + ffi (>= 1.9.25, < 1.13) 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, >= 1.9.25) + ffi (>= 1.9.25, < 1.13) 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.13.0) - ffi (1.13.0-x64-mingw32) - ffi (1.13.0-x86-mingw32) + ffi (1.12.2) + ffi (1.12.2-x64-mingw32) + ffi (1.12.2-x86-mingw32) ffi-libarchive (1.0.0) ffi (~> 1.0) ffi-win32-extensions (1.0.3) diff --git a/chef.gemspec b/chef.gemspec index 65e691bd28..e99d9e9e83 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", ">= 1.9.25" + s.add_dependency "ffi", ">= 1.9.25", "< 1.13" # https://github.com/ffi/ffi/issues/784 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" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 934e9fe2d2..4112336d0e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,12 +1,13 @@ GIT remote: https://github.com/chef/omnibus - revision: 3327abfbe926622e8759a7001ebc0ed40e74a533 + revision: 61139fb5a5b1a0a9a212d1e1efc1f88776d0479a branch: master specs: - omnibus (7.0.10) + omnibus (7.0.12) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) + ffi (< 1.13) ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (>= 2.0, < 4.0) @@ -29,19 +30,19 @@ GEM specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.13) + artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.322.0) - aws-sdk-core (3.97.0) + aws-partitions (1.324.0) + aws-sdk-core (3.97.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.32.0) + aws-sdk-kms (1.33.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.67.0) + aws-sdk-s3 (1.67.1) aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) |