4
0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-05-10 20:29:36 +00:00

test new wraper

This commit is contained in:
Andrei Yankovich 2019-12-27 15:13:59 +03:00
parent 54b71188bf
commit 5231f24998
4 changed files with 16 additions and 19 deletions

@ -17,7 +17,6 @@ class AsssetsInstaller(BaseModule):
def isInit(self, step):
return step.getProperty('module') == 'init'
@util.renderer
def RemoveOldData(self, props):
cmd = "mkdir -p " + self.AndroidBaseDir
@ -27,7 +26,6 @@ class AsssetsInstaller(BaseModule):
return self.generateCmd(cmd)
@util.renderer
def NDKDownloadCMD(self, props):
link = props.getProperty("link")
@ -38,7 +36,6 @@ class AsssetsInstaller(BaseModule):
"--output",
self.AndroidBaseDir + "/temp" + self.format]
@util.renderer
def ExtractCMD(self, props):
res = ["echo", "format '" + format + "' not supported"]
@ -49,7 +46,6 @@ class AsssetsInstaller(BaseModule):
return res
@util.renderer
def InstallCMD(self, props):
module = props.getProperty("module")
@ -62,7 +58,6 @@ class AsssetsInstaller(BaseModule):
return ["sdkmanager", unit_to_multiplier.get(module, "--list")]
@util.renderer
def ConfigureCMD(self, props):
res = ["echo", "Configure failed"]

@ -24,6 +24,10 @@ class BaseModule:
return step.getProperty('Android')
def generateCmd(self, bashString):
if isinstance(bashString, list):
return bashString
return self.MULTIPLE_SH_COMMAND + [bashString]
def getFactory(self):
@ -32,11 +36,14 @@ class BaseModule:
def getRepo(self):
return ""
def getRendererWraper(self, func):
def getWraper(self, object):
@util.renderer
def cmdWraper(step):
return func(step)
if not callable(object):
return self.generateCmd(object)
return object(step)
return cmdWraper

@ -110,15 +110,8 @@ class Make(BaseModule):
def dustepIf(step):
return checkFunc(step) and platformCgek[platform](step)
@util.renderer
def cmdWraper(step):
if not callable(cmd):
return cmd
return cmd(step)
res = steps.ShellCommand(
command=cmdWraper,
command=self.getWraper(cmd),
haltOnFailure=True,
doStepIf=lambda step: dustepIf(step),
hideStepIf=lambda results, step: not dustepIf(step),
@ -198,9 +191,9 @@ class Make(BaseModule):
factory.addStep(
steps.DirectoryUpload(
workersrc=util.Interpolate('%(prop:copyFolder)s'),
masterdest=self.getRendererWraper(self.destDir),
url=self.getRendererWraper(self.destDirUrl),
doStepIf=self.getRendererWraper(self.isDeploy),
masterdest=self.getWraper(self.destDir),
url=self.getWraper(self.destDirUrl),
doStepIf=self.getWraper(self.isDeploy),
name='copy buildet files',
description='copy buildet files to shared folder',
)

@ -1,6 +1,8 @@
# This Python file uses the following encoding: utf-8
from BuildBotLib.make import Make
from BuildBotLib.basemodule import BaseModule
from buildbot.plugins import util, steps
import subprocess
@ -240,7 +242,7 @@ class QtUpdater(Make):
def getPropertyes(self):
base = super().getPropertyes()
base = BaseModule.getPropertyes(self)
return base + [
util.BooleanParameter(