litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adapt the release scripts to an older Git client

Browse source
This commit is contained in:
Jim Blake 2013-10-18 14:48:28 -04:00
parent 3df439c4a7
commit 02280e6171
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
utilities/releaseScripts/3_create_tags.rb
View file

@ -25,15 +25,11 @@ def create_tag(dir, branch, tag, message)
"git pull",
"git tag -a #{tag} -m '#{message}'"
]
cmds.delete_at(1) unless is_remote_branch?(branch)
cmds.delete_at(1) unless remote_branch_exists?(path, branch)
approve_and_execute(cmds, "in #{path}")
end
end
def is_remote_branch?(branch)
! `git branch --list -a origin/#{branch}`.strip.empty?
end
#
# ------------------------------------------------------------------------------------
# Main method

8
utilities/releaseScripts/4_extract_files.rb
View file

@ -26,7 +26,7 @@ def export_files(vivo_path, vitro_path, tag, branch, export_dir)
cmds = ["git checkout #{branch}",
"git pull",
]
cmds.delete_at(1) unless is_remote_branch?(branch)
cmds.delete_at(1) unless remote_branch_exists?(path, branch)
approve_and_execute(cmds, "in #{path}")
end
@ -34,7 +34,7 @@ def export_files(vivo_path, vitro_path, tag, branch, export_dir)
cmds = ["git checkout #{branch}",
"git pull",
]
cmds.delete_at(1) unless is_remote_branch?(branch)
cmds.delete_at(1) unless remote_branch_exists?(path, branch)
approve_and_execute(cmds, "in #{path}")
end
@ -47,10 +47,6 @@ def export_files(vivo_path, vitro_path, tag, branch, export_dir)
])
end
def is_remote_branch?(branch)
! `git branch --list -a origin/#{branch}`.strip.empty?
end
#
# ------------------------------------------------------------------------------------
# Main method

13
utilities/releaseScripts/_common.rb
View file

@ -239,13 +239,22 @@ end
def branch_exists?(dir, branch)
Dir.chdir(dir) do |path|
! `git branch --list #{branch}`.strip.empty?
re = Regexp.new("\\b#{branch}\\b")
`git branch`.index(re)
end
end
def remote_branch_exists?(dir, branch)
Dir.chdir(dir) do |path|
re = Regexp.new("remotes/origin/#{branch}\\b")
`git branch -a`.index(re)
end
end
def tag_exists?(dir, tag)
Dir.chdir(dir) do |path|
!`git tag --list #{tag}`.strip.empty?
re = Regexp.new("\\b#{tag}\\b")
`git tag`.index(re)
end
end