QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-27 22:34:30 +00:00
Code Issues Projects Releases Wiki Activity

use new wraper

Browse Source
This commit is contained in:
Andrei Yankovich 2019-12-27 15:28:05 +03:00
parent 5231f24998
commit 90741be37f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BuildBotLib/asssetsinstaller.py
View File

@ -79,9 +79,9 @@ class AsssetsInstaller(BaseModule):
factory.addStep(
steps.ShellCommand(
command=self.RemoveOldData,
command=self.getWraper(self.RemoveOldData),
name='rm old item',
doStepIf=self.isInit,
doStepIf=self.getWraper(self.isInit),
description='rm old',
haltOnFailure=True,
)
@ -89,9 +89,9 @@ class AsssetsInstaller(BaseModule):
factory.addStep(
steps.ShellCommand(
command=self.NDKDownloadCMD,
command=self.getWraper(self.NDKDownloadCMD),
name='download new item',
doStepIf=self.isInit,
doStepIf=self.getWraper(self.isInit),
description='download new item',
haltOnFailure=True,
)
@ -99,9 +99,9 @@ class AsssetsInstaller(BaseModule):
factory.addStep(
steps.ShellCommand(
command=self.ExtractCMD,
command=self.getWraper(self.ExtractCMD),
name='extract new item',
doStepIf=self.isInit,
doStepIf=self.getWraper(self.isInit),
description='extract new item',
haltOnFailure=True,
)
@ -109,9 +109,9 @@ class AsssetsInstaller(BaseModule):
factory.addStep(
steps.ShellCommand(
command=self.ConfigureCMD,
command=self.getWraper(self.ConfigureCMD),
name='configure new item',
doStepIf=self.isInit,
doStepIf=self.getWraper(self.isInit),
description='configure new item',
haltOnFailure=True,
)
@ -119,7 +119,7 @@ class AsssetsInstaller(BaseModule):
factory.addStep(
steps.ShellCommand(
command=self.InstallCMD,
command=self.getWraper(self.InstallCMD),
name='install module',
doStepIf=lambda step: not self.isInit(step),
description='configure new item',

2
BuildBotLib/qtUpdater.py
View File

@ -80,7 +80,6 @@ class QtUpdater(Make):
return res
@util.renderer
def getHelp(self, props):
result = ""
@ -152,7 +151,6 @@ class QtUpdater(Make):
self.lastTargetDir = self.home + "/Qt/" + branch + "/" + platform
return ["-prefix", self.lastTargetDir]
@util.renderer
def getWindowsConfigOptions(self, props):
list = [
"-skip", "qtactiveqt",