fix git steps

This commit is contained in:
Andrei Yankovich 2021-03-30 17:15:29 +03:00
parent 8a059ec29e
commit 5553e1fbef

View File

@ -259,11 +259,15 @@ class Make(BaseModule):
def getFactory(self): def getFactory(self):
factory = super().getFactory() factory = super().getFactory()
if self.isWin(""): def getPreviousStepStatus(steps):
factory.addStep(self.generateStep(["rm", ".git", "-rdf"], steps_status = steps.build.build_status.getSteps()
self.platform, self_status_index = steps_status.index(steps.step_status)
'clear work dir', if self_status_index == 0:
lambda step: True)) return (None, 0)
return steps_status[self_status_index - 1].results
def doForce(steps):
return getPreviousStepStatus(steps)
factory.addStep( factory.addStep(
steps.Git( steps.Git(
@ -272,8 +276,22 @@ class Make(BaseModule):
mode='full', mode='full',
method='fresh', method='fresh',
submodules=True, submodules=True,
warnOnFailure=True,
haltOnFailure=False,
name='git operations', name='git operations',
description='operations of git like pull clone fetch', description='operations of git like pull clone fetch',
),
steps.Git(
repourl=util.Interpolate('%(prop:repository)s'),
branch=util.Interpolate('%(prop:branch)s'),
mode='full',
method='clobber',
submodules=True,
name='git operations force',
doStepIf=doForce,
description='operations of git like pull clone' +
'fetch (force remove all old data)',
) )
) )