Skip to content
Snippets Groups Projects
Commit f498338a5ebd authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'sh-force-ruby-platform-build-omnibus-gems' into 'master'

Ensure Omnibus GitLab gems are recompiled for older platforms

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



Merged-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarDmytro Makovey <dmakovey@gitlab.com>
Approved-by: default avatarRyan Egesdahl <regesdahl@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Reviewed-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
1 merge request!143Merge upstream Omnibus GitLab up to the 17.1 branching point
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
## limitations under the License. ## limitations under the License.
# #
require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb"
name 'omnibus-gitlab-gems' name 'omnibus-gitlab-gems'
default_version '20240110' default_version '20240110'
...@@ -49,6 +50,7 @@ ...@@ -49,6 +50,7 @@
target_gemfile = File.join(gemfile_dir, 'Gemfile') target_gemfile = File.join(gemfile_dir, 'Gemfile')
env['BUNDLE_GEMFILE'] = target_gemfile env['BUNDLE_GEMFILE'] = target_gemfile
bundle "config set --local frozen 'true'", env: env 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 "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 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" copy "license.json", "#{install_dir}/licenses/omnibus-gitlab-gems.json"
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
faraday-net_http (3.0.2) faraday-net_http (3.0.2)
faraday-retry (2.2.1) faraday-retry (2.2.1)
faraday (~> 2.0) faraday (~> 2.0)
ffi (1.16.3) ffi (1.17.0)
ffi-libarchive (1.1.14) ffi-libarchive (1.1.14)
ffi (~> 1.0) ffi (~> 1.0)
ffi-yajl (2.6.0) ffi-yajl (2.6.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