Merge pull request #1154 from chef/CHEF-14201-fix-bundler-install

Chef 14201 fix bundler install - Update ffi and train-core dependency
chef · Jul 17, 2024 · 41d5c3b · 41d5c3b
2 parents 5c0122b + cea6cbe
commit 41d5c3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -10,13 +10,6 @@ expeditor:
       timeout_in_minutes: 30
 
 steps:
-- label: run-lint-and-specs-ruby-2.7
-  command:
-    - .expeditor/run_linux_tests.sh rake
-  expeditor:
-    executor:
-      docker:
-        image: ruby:2.7-buster
 
 - label: run-lint-and-specs-ruby-3.0
   command:

diff --git a/omnibus.gemspec b/omnibus.gemspec
@@ -32,6 +32,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "contracts",        ">= 0.16.0", "< 0.17.0"
   gem.add_dependency "rexml",            "~> 3.2"
 
+  if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("3.1.0")
+    gem.add_dependency "ffi", "< 1.17.0"
+    gem.add_dependency "train-core", "< 3.12.5"
+  end
+
   gem.add_dependency "mixlib-versioning"
   gem.add_dependency "pedump"