Skip to content

Configure local Gemfile before force_ruby_platform

vincent stchu requested to merge vincent_stchu/omnibus-gitlab:change-rails-bundle-config-execution-order into master 
Configure local Gemfile before force_ruby_platform

Set the local Gemfile prior to configuring the target build platform
when building the main GitLab rails project. This change ensures builds
using a Gemfile outside the project root will have force_ruby_platform
set correctly and build gems for the ARM64 architecture.

Changelog: changed

What does this MR do?

The fix in !6028 (merged) does not take effect when we specify the Gemfile which is not in the project root directory.

Specifically, when we set the gitlab_bundle_gemfile to jh/Gemfile, the previous bundle config of force_ruby_platform does not work. We have to move the config of setting Gemfile ahead. This issue was not spotted until we planned to build our arm based release recently.

Related issues

#6773 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
  • trigger-package has a green pipeline running against latest commit

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for the GitLab Chart opened
Edited by Robert Marshall

Merge request reports