diff --git a/config/software/omnibus-gitlab-gems.rb b/config/software/omnibus-gitlab-gems.rb index 7eb01094f3140671f516d60512285cae95e93e43_Y29uZmlnL3NvZnR3YXJlL29tbmlidXMtZ2l0bGFiLWdlbXMucmI=..f498338a5ebd0840ff0a40b0b1d83e8a048609fc_Y29uZmlnL3NvZnR3YXJlL29tbmlidXMtZ2l0bGFiLWdlbXMucmI= 100644 --- a/config/software/omnibus-gitlab-gems.rb +++ b/config/software/omnibus-gitlab-gems.rb @@ -15,6 +15,7 @@ ## limitations under the License. # +require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb" name 'omnibus-gitlab-gems' default_version '20240110' @@ -49,6 +50,7 @@ target_gemfile = File.join(gemfile_dir, 'Gemfile') env['BUNDLE_GEMFILE'] = target_gemfile bundle "config set --local frozen 'true'", env: env + bundle 'config force_ruby_platform true', env: env if OhaiHelper.ruby_native_gems_unsupported? bundle "install --jobs #{workers} --retry 5", env: env bundle "exec license_finder report --project_path=#{gemfile_dir} --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json", env: env copy "license.json", "#{install_dir}/licenses/omnibus-gitlab-gems.json" diff --git a/config/templates/omnibus-gitlab-gems/Gemfile.lock b/config/templates/omnibus-gitlab-gems/Gemfile.lock index 7eb01094f3140671f516d60512285cae95e93e43_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGUubG9jaw==..f498338a5ebd0840ff0a40b0b1d83e8a048609fc_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGUubG9jaw== 100644 --- a/config/templates/omnibus-gitlab-gems/Gemfile.lock +++ b/config/templates/omnibus-gitlab-gems/Gemfile.lock @@ -163,7 +163,7 @@ faraday-net_http (3.0.2) faraday-retry (2.2.1) faraday (~> 2.0) - ffi (1.16.3) + ffi (1.17.0) ffi-libarchive (1.1.14) ffi (~> 1.0) ffi-yajl (2.6.0)