From 8ee28c121122d8d7d7d177910d91cdd2d44f6869 Mon Sep 17 00:00:00 2001 From: James Stocks Date: Wed, 10 Jun 2020 12:11:50 +0100 Subject: [PATCH] Change ffi pinning 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 --- Gemfile | 2 +- omnibus/Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4a97835cc..22562b92a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "inspec", path: "." # in it in order to package the executable. Hence the odd backwards dependency. 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 gem "rb-readline" diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 85194f59f..4caac9c47 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,11 +1,11 @@ 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-software", git: "https://github.com/chef/omnibus-software", branch: "master" gem "artifactory" +gem "ffi", ">= 1.9.14", "!= 1.13.0" + # 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 # the Test Kitchen-based build lab. You can skip these unnecessary dependencies