tyler.durden/icinga-docs-tools
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-docs-tools.git synced 2025-07-23 13:54:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that branch checkouts always pull master instead of origin branch

Browse Source
This commit is contained in:
Michael Friedrich 2017-09-21 13:58:55 +02:00 committed by root
parent 4767782866
commit 699bd3e962
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-docs.rb
View File

@ -27,14 +27,15 @@ config['projects'].each do |project_name, project_config|
puts 'Cloning ...' puts 'Cloning ...'
FileUtils.mkdir_p(project_dir) FileUtils.mkdir_p(project_dir)
repo = Git.clone(project_config['git'], clone_target) repo = Git.clone(project_config['git'], clone_target)
puts "Checkout ref '#{project_config['ref']}'"
repo.branch(project_config['ref']).checkout
else else
repo = Git.open(clone_target) repo = Git.open(clone_target)
repo.fetch() repo.fetch()
end
puts "Checkout ref '#{project_config['ref']}'" puts "Checkout ref '#{project_config['ref']}'"
repo.branch(project_config['ref']).checkout repo.branch(project_config['ref']).checkout
repo.pull() repo.pull('origin', project_config['ref'])
end
puts "Building page index from #{project_docs_dir}" puts "Building page index from #{project_docs_dir}"
Dir.glob("#{project_docs_dir}/*.md", File::FNM_CASEFOLD).sort.each do |file| Dir.glob("#{project_docs_dir}/*.md", File::FNM_CASEFOLD).sort.each do |file|