Handle optionnal ref for remote static repository
This commit is contained in:
parent
5038887ee0
commit
6173fbdae2
1 changed files with 7 additions and 3 deletions
10
fabfile.py
vendored
10
fabfile.py
vendored
|
@ -252,7 +252,7 @@ def collect_remote_statics():
|
||||||
run('mkdir -p {0}'.format(remote_static_dir))
|
run('mkdir -p {0}'.format(remote_static_dir))
|
||||||
remote_repositories = {
|
remote_repositories = {
|
||||||
'leaflet': "git://github.com/Leaflet/Leaflet.git@stable",
|
'leaflet': "git://github.com/Leaflet/Leaflet.git@stable",
|
||||||
'draw': "git://github.com/Leaflet/Leaflet.draw.git@master",
|
'draw': "git://github.com/Leaflet/Leaflet.draw.git@master#v0.1.7",
|
||||||
'hash': "git://github.com/mlevans/leaflet-hash.git@master",
|
'hash': "git://github.com/mlevans/leaflet-hash.git@master",
|
||||||
'storage': 'git://github.com/yohanboniface/Leaflet.Storage.git@master',
|
'storage': 'git://github.com/yohanboniface/Leaflet.Storage.git@master',
|
||||||
'edit_in_osm': 'git://github.com/yohanboniface/Leaflet.EditInOSM.git@master',
|
'edit_in_osm': 'git://github.com/yohanboniface/Leaflet.EditInOSM.git@master',
|
||||||
|
@ -262,12 +262,16 @@ def collect_remote_statics():
|
||||||
with cd(remote_static_dir):
|
with cd(remote_static_dir):
|
||||||
for subdir, path in remote_repositories.iteritems():
|
for subdir, path in remote_repositories.iteritems():
|
||||||
repository, branch = path.split('@')
|
repository, branch = path.split('@')
|
||||||
|
if "#" in branch:
|
||||||
|
branch, ref = branch.split('#')
|
||||||
|
else:
|
||||||
|
ref = branch
|
||||||
with hide("running", "stdout"):
|
with hide("running", "stdout"):
|
||||||
exists = run('if [ -d "{0}" ]; then echo 1; fi'.format(subdir))
|
exists = run('if [ -d "{0}" ]; then echo 1; fi'.format(subdir))
|
||||||
if exists:
|
if exists:
|
||||||
with cd(subdir):
|
with cd(subdir):
|
||||||
run('git pull')
|
run('git pull origin {0}'.format(branch))
|
||||||
else:
|
else:
|
||||||
run('git clone {0} {1}'.format(repository, subdir))
|
run('git clone {0} {1}'.format(repository, subdir))
|
||||||
with cd(subdir):
|
with cd(subdir):
|
||||||
run('git checkout {0}'.format(branch))
|
run('git checkout {0}'.format(ref))
|
||||||
|
|
Loading…
Reference in a new issue