Skip to content

Fix sed to support code-sync bundle install

Baodong请求将fix-code-sync-bundle-install合并到main-jh

What does this MR do and why?

Fix sed to support code-sync bundle install.

Changes from: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121676/diffs

Ref comments

https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121676#note_1423258987

Q: question: Do we plan to move vendor/gems/* to gems/* at some point?

A: The purpose of vendor/gems/ and gems/:

  • gems/ is to our developed in-house gems
  • vendor/gems/ are to external gems that we pulled into repository for simplicity purposes, that are regularly stored in another repository So, there are gems developed by us, but also gems that are external: https://gitlab.com/gitlab-org/gitlab/-/blob/master/vendor/gems/attr_encrypted/attr_encrypted.gemspec. So, if the gem is developed by us, should be moved into gems/ only if it does not have external repo with which it is kept in sync.
  • rubygems if applicable, but heavy on the process, requires separate project

Screenshots or screen recordings

Non-UI

How to set up and validate locally

Bug behavior

% git checkout main-jh
% git fetch -all
% git merge origin/master
% ./jh/bin/build_static_gemfile
% bundle

Error message outputs:

The path `/Users/cbd/codes/gitlab-jh-group/jihulab-gdk/gitlab/jh/gems/gitlab-rspec` does not exist.

After fixing

% git checkout <current-branch>
% ./jh/bin/build_static_gemfile
% bundle

Successful message outputs:

Bundle complete! 319 Gemfile dependencies, 647 gems now installed.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Baodong 编辑于

合并请求报告

加载中