fix upload file

This commit is contained in:
Andrei Yankovich 2019-09-26 17:23:13 +03:00
parent ddf4f95a0d
commit fce6e7f2cf
2 changed files with 27 additions and 11 deletions

View File

@ -8,7 +8,6 @@ import os
import subprocess import subprocess
from BuildBotLib.secretManager import * from BuildBotLib.secretManager import *
def isClean(step): def isClean(step):
return step.getProperty('clean'); return step.getProperty('clean');
@ -32,13 +31,22 @@ def isLinux(step):
def isAndroid(step): def isAndroid(step):
return step.getProperty('Android'); return step.getProperty('Android');
@util.renderer def destDirPrivate(props):
def destDir(props):
home = str(Path.home())
repo = str(props.getProperty('repository')); repo = str(props.getProperty('repository'));
now = datetime.datetime.now().strftime("(%H %M) %m-%d-%Y") now = datetime.datetime.now().strftime("(%H %M) %m-%d-%Y")
return home + '/shared/' + repo[repo.rfind('/'): len(repo) - 4] + "/" + now return repo[repo.rfind('/'): len(repo) - 4] + "/" + now;
@util.renderer
def destDir(props):
home = str(Path.home())
return home + '/shared/' + destDirPrivate(props);
@util.renderer
def destDirUrl(props):
path = destDirPrivate(props);
return "http://quasarapp.ddns.net:3031/" + path;
@util.renderer @util.renderer
def permission(props): def permission(props):
@ -252,9 +260,10 @@ def getFactory():
factory.addSteps(AndroidSteps()); factory.addSteps(AndroidSteps());
factory.addStep( factory.addStep(
steps.CopyDirectory( steps.DirectoryUpload(
src = util.Interpolate('build/%(prop:copyFolder)s'), workersrc = util.Interpolate('build/%(prop:copyFolder)s'),
dest = destDir, masterdest = destDir,
url = destDirUrl,
doStepIf = lambda step : isDeploy(step), doStepIf = lambda step : isDeploy(step),
name = 'copy buildet files', name = 'copy buildet files',
description = 'copy buildet files to shared folder', description = 'copy buildet files to shared folder',

View File

@ -5,8 +5,15 @@ from pathlib import Path
class SecretManager: class SecretManager:
def __init__(self, jsFile): def __init__(self, jsFile):
try:
contents = Path(jsFile).read_text() contents = Path(jsFile).read_text()
self.jsfile = json.loads(contents) self.jsfile = json.loads(contents)
except:
pass
def getValue(self, key): def getValue(self, key):
try:
return self.jsfile[key] return self.jsfile[key]
except:
pass