Skip to content
Snippets Groups Projects
Commit 55e50b37ffc7 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'sh-ffi-force-ruby-platform' into 'master'

Force ffi gem to use Ruby platform gem

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
1 merge request!145Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -18,7 +18,7 @@
require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb"
name 'omnibus-gitlab-gems'
default_version '20240110'
default_version '20240619'
license 'MIT'
license_file 'LICENSE'
......
......@@ -8,6 +8,10 @@
# found with the Ruby interpreter unless `bundle exec` is used.
source 'https://rubygems.org'
# To ensure LD_LIBRARY_PATH includes /opt/gitlab/embedded/lib avoid
# the precompiled native gems.
gem 'ffi', '1.17.0', force_ruby_platform: true
# chef depends on unf_ext. This needs to be listed before Chef
# since Cinc will look inside the Cinc RubyGems.
gem 'unf_ext', '0.0.9.1'
......
......@@ -401,6 +401,7 @@
chef-zero (= 15.0.11)!
faraday (= 2.8.1)
faraday-net_http (= 3.0.2)
ffi (= 1.17.0)
gitlab-ruby-shadow (= 2.5.1)
inspec-core (= 6.6.0)!
license_finder (= 7.1.0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment