[Compass-ci] Re: [PATCH compass-ci] git_mirror: pull submodule if repositories have

On Tue, Nov 10, 2020 at 03:21:30PM +0800, Li Yuanchao wrote:

[why] Some repositories have submodules. Without these submodules, they can not be built successfully. Submodules of repositories are repositories too.

Signed-off-by: Li Yuanchao lyc163mail@163.com

lib/git_mirror.rb | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 9d6a45d..6b7f80e 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -56,7 +56,8 @@ class GitMirror

def mirror_sync fork_info = @queue.pop

• mirror_dir = "/srv/git/#{fork_info['git_repo']}.git"

• mirror_dir = "/srv/git/#{fork_info['git_repo']}"
• mirror_dir = "#{mirror_dir}.git" unless fork_info['is_submodule'] possible_new_refs = false if File.directory?(mirror_dir) possible_new_refs = git_fetch(mirror_dir)

@@ -159,6 +160,8 @@ class MirrorMain

feedback_info = @feedback_queue.pop(true)
git_repo = feedback_info[:git_repo]

• return if check_submodule(git_repo)
• update_fork_stat(git_repo, feedback_info[:possible_new_refs]) return unless feedback_info[:possible_new_refs]

@@ -219,6 +222,8 @@ class MirrorMain end

def get_cur_refs(git_repo)

• return if @git_info[git_repo]['is_submodule']
• mirror_dir = "/srv/git/#{git_repo}.git" show_ref_out = %x(git -C #{mirror_dir} show-ref --heads) cur_refs = { heads: {} }

@@ -328,4 +333,31 @@ class MirrorMain end end end

• def handle_submodule(submodule, parent_project)
• submodule.each_line do |line|

•  next unless line.include?('url = ')
  

•  strings = line.split(' = ')
  

url = line.split(' = ')[1].chomp

Could remove "strings" variable?

Thanks, Zhang Yuhang

•  url = strings[1].chomp
  

•  git_repo = "submodules/#{parent_project[0]}/#{parent_project}/#{File.basename(url)}"
  

•  @git_info[git_repo] = { 'url' => url, 'git_repo' => git_repo, 'is_submodule' => true }
  

•  fork_stat_init(git_repo)
  

•  @priority_queue.push git_repo, @priority
  

•  @priority += 1
  

• end
• end
• def check_submodule(git_repo)
• if @git_info[git_repo]['is_submodule']

•  @fork_stat[git_repo][:queued] = false
  

•  return true
  

• end
• mirror_dir = "/srv/git/#{git_repo}.git"
• submodule = %x(git -C #{mirror_dir} show HEAD:.gitmodules)
• return if submodule.empty?
• handle_submodule(submodule, File.basename(git_repo))
• end

end

2.23.0