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

fix errors of step 2

This commit is contained in:
Andrei Yankovich 2019-10-06 20:17:52 +03:00
parent 96edfbbce7
commit 6753124e81
6 changed files with 87 additions and 80 deletions

@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import BuildBotLib.basemodule as BaseModule
from BuildBotLib.basemodule import BaseModule
from buildbot.plugins import secrets, util, steps
from pathlib import Path
import datetime

@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import BuildBotLib.make as Make
from BuildBotLib.make import Make
from buildbot.plugins import secrets, util, steps
from pathlib import Path
import datetime
@ -9,61 +9,61 @@ import subprocess
from BuildBotLib.secretManager import *
class QMake(Make):
class CMake(Make):
def __init__(self):
Make.__init__(self);
@util.renderer
def linuxXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
@util.renderer
def linuxXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=linux-g++',
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=linux-g++',
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
]
]
return command
return command
@util.renderer
def windowsXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
@util.renderer
def windowsXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=win64-g++',
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=win64-g++',
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
]
]
return command
return command
@util.renderer
def androidXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
@util.renderer
def androidXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
QT_Dir = subprocess.getoutput(['qmake-android -query QT_HOST_PREFIX'])
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=android-clang',
command = [
'cmake', '-DCMAKE_PREFIX_PATH=' + QT_Dir,
'-DSPEC_X=android-clang',
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
]
]
return command
return command

@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import BuildBotLib.basemodule as BaseModule
from BuildBotLib.basemodule import BaseModule
from buildbot.plugins import secrets, util, steps
from pathlib import Path

@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import BuildBotLib.make as Make
from BuildBotLib.make import Make
from buildbot.plugins import secrets, util, steps
from pathlib import Path
import datetime
@ -14,42 +14,42 @@ class QMake(Make):
def __init__(self):
Make.__init__(self);
@util.renderer
def linuxXmakeCmd(self, props):
command = [
'qmake-linux',
"-r",
"CONFIG+=qtquickcompiler",
'ONLINE="~/repo"'
];
@util.renderer
def linuxXmakeCmd(self, props):
command = [
'qmake-linux',
"-r",
"CONFIG+=qtquickcompiler",
'ONLINE="~/repo"'
];
return command;
return command;
@util.renderer
def windowsXmakeCmd(self, props):
command = [
'qmake-windows',
'-spec', 'win32-g++',
"-r",
"CONFIG+=qtquickcompiler",
'ONLINE="~/repo"'
];
@util.renderer
def windowsXmakeCmd(self, props):
command = [
'qmake-windows',
'-spec', 'win32-g++',
"-r",
"CONFIG+=qtquickcompiler",
'ONLINE="~/repo"'
];
return command;
return command;
@util.renderer
def androidXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
@util.renderer
def androidXmakeCmd(self, props):
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")
command = [
'qmake-android',
'-spec', 'android-clang',
"-r",
"CONFIG+=qtquickcompiler",
'SIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'SIGN_ALIES="quasarapp"',
'SIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
command = [
'qmake-android',
'-spec', 'android-clang',
"-r",
"CONFIG+=qtquickcompiler",
'SIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'SIGN_ALIES="quasarapp"',
'SIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"'
];
];
return command;
return command;

@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import BuildBotLib.basemodule as BaseModule
from BuildBotLib.basemodule import BaseModule
from buildbot.plugins import util, steps
from pathlib import Path
import subprocess

@ -4,8 +4,10 @@
from buildbot.plugins import *
from BuildBotLib.buildbot import *
from buildbot.www import authz, auth
import BuildBotLib.cmake as CMake
import BuildBotLib.qmake as QMake
from BuildBotLib.cmake import CMake
from BuildBotLib.qmake import QMake
from BuildBotLib.NPM import NPM
from BuildBotLib.qtUpdater import QtUpdater
# This is a sample buildmaster config file. It must be installed as
# 'master.cfg' in your buildmaster's base directory.
@ -15,10 +17,15 @@ import BuildBotLib.qmake as QMake
bot = BuildBot();
bot.addBuilder("github-worker", "qmake");
bot.addBuilder("Tester", "qmake");
bot.addBuilder("qtBuilder", "qtUpdater");
bot.addBuilder("NPM", "NPM");
qmake = QMake();
npm = NPM();
qtUpdater = QtUpdater();
bot.addBuilder("github-worker", qmake);
bot.addBuilder("Tester", qmake);
bot.addBuilder("qtBuilder", qtUpdater);
bot.addBuilder("NPM", npm);
c = BuildmasterConfig = bot.getMaster()