QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-05-08 11:19:41 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andrei Yankovich 2019-07-22 12:01:57 +03:00
parent 253556c9e5
commit eee6a6731f
3 changed files with 5 additions and 12 deletions

5
BuildBotLib/buildBotIdentity.py

@ -35,8 +35,9 @@ class buildBotIdentity(BuildBotModule):
util.RolesFromUsername(roles=['admins'], usernames=['ZIG'])
]
)
self.masterConf['www']['auth'] = util.UserPasswordAuth([
('EndrII', util.Secret("ENDRII")),
('ZIG', util.Secret("ZIG"))
('EndrII', util.Secret("ENDRII").value),
('ZIG', util.Secret("ZIG").value)
])

8
BuildBotLib/buildbot.py

@ -53,12 +53,6 @@ class BuildBot:
self.masterConf.update(self.sources.getMasterConf());
def addChangeSource(self, rep):
self.masterConf['change_source'].append(GitPoller(
rep,
workdir='gitpoller-workdir', branch='master',
pollInterval=300))
def addBuilder(self, worker, factory):
module = self.importWithReload(factory);
self.masterConf['builders'].append(
@ -71,8 +65,6 @@ class BuildBot:
self.shedulers.addScheduler(module.getPropertyes(), worker)
self.builders.append(worker);
# self.addChangeSource(module.getRepo())
def addService(self, service):
logging.error("addService not support!")

4
BuildBotLib/qmake.py

@ -115,9 +115,9 @@ def androidQmake(props):
'-spec', 'android-clang',
"-r",
"CONFIG+=qtquickcompiler",
util.Interpolate('SIGN_PATH="%(secret:SIGPATH)s"'),
'SIGN_PATH="' + util.Secret("SIGPATH").value + '"',
'SIGN_ALIES="quasarapp"',
util.Interpolate('SIGN_STORE_PASSWORD="%(secret:SIGPATH)s"')
'SIGN_STORE_PASSWORD="' + util.Secret("SIGPASS").value + '"'
]
return command