kopia lustrzana https://github.com/jupyterhub/repo2docker
Add handling for no ref being provided
We do not need to checkout a specific ref if none is provided. Added a test to check the behaviour.pull/128/head
rodzic
7a007d7f6b
commit
cb1b1442f2
|
@ -144,6 +144,9 @@ class Repo2Docker(Application):
|
||||||
# create a shallow clone first
|
# create a shallow clone first
|
||||||
_clone(depth=50)
|
_clone(depth=50)
|
||||||
|
|
||||||
|
# ref == None means we want to use HEAD so no need to checkout a
|
||||||
|
# specific revision
|
||||||
|
if ref is not None:
|
||||||
if not _contains(ref):
|
if not _contains(ref):
|
||||||
# have to create a full clone
|
# have to create a full clone
|
||||||
_unshallow()
|
_unshallow()
|
||||||
|
|
|
@ -51,9 +51,8 @@ class RemoteRepoTest(pytest.Item):
|
||||||
self.verify = verify
|
self.verify = verify
|
||||||
|
|
||||||
def runtest(self):
|
def runtest(self):
|
||||||
subprocess.check_call([
|
if self.ref is not None:
|
||||||
'jupyter-repo2docker',
|
cmd = ['jupyter-repo2docker', '--ref', self.ref, self.url, '--']
|
||||||
'--ref', self.ref,
|
else:
|
||||||
self.url,
|
cmd = ['jupyter-repo2docker', self.url, '--']
|
||||||
'--',
|
subprocess.check_call(cmd + shlex.split(self.verify))
|
||||||
] + shlex.split(self.verify))
|
|
||||||
|
|
|
@ -11,3 +11,9 @@
|
||||||
# we checkout the second to last commit, hence the log has 49 entries at a
|
# we checkout the second to last commit, hence the log has 49 entries at a
|
||||||
# max clone depth of 50
|
# max clone depth of 50
|
||||||
verify: /bin/bash -c '[ $(git log --oneline | wc -l) == "49" ]'
|
verify: /bin/bash -c '[ $(git log --oneline | wc -l) == "49" ]'
|
||||||
|
|
||||||
|
- name: A dummy repo with 100 commits - live at HEAD
|
||||||
|
url: https://github.com/betatim/repo2docker-ci-clone-depth
|
||||||
|
# provide no ref, aka use HEAD, aka the 100th commit
|
||||||
|
ref: NULL
|
||||||
|
verify: python -c "commit = open('COMMIT').read(); assert int(commit) == 100, 'this is not the 100th commit'"
|
||||||
|
|
Ładowanie…
Reference in New Issue