QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-29 15:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from QuasarApp/SeparateAndroidBuilds

Browse Source 
Separate android builds
This commit is contained in:
Andrei Yankovich 2021-04-11 17:29:10 +03:00 committed by GitHub
commit 54da0a4843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildBotLib/buildBotShedulers.py
View File

@ -25,10 +25,10 @@ class BuildBotShedulers(BuildBotModule):
def initScheduler(self): def initScheduler(self):
buildersCode = ['LinuxBuilder', buildersCode = ['LinuxBuilder',
'AndroidBuilder', 'AndroidBuilder_v7',
'AndroidBuilder_v8',
'WindowsBuilder', 'WindowsBuilder',
'LinuxCMakeBuilder', 'LinuxCMakeBuilder',
'AndroidCMakeBuilder',
'WindowsCMakeBuilder', 'WindowsCMakeBuilder',
'Wasm32Builder', 'Wasm32Builder',
] ]

4
BuildBotLib/buildBotWorkers.py
View File

@ -21,10 +21,10 @@ class BuildBotWorkers(BuildBotModule):
password = scr.getValue('WorkerPass') password = scr.getValue('WorkerPass')
self.masterConf['workers'] = [ self.masterConf['workers'] = [
worker.Worker("AndroidBuilder", password),
worker.Worker("LinuxBuilder", password), worker.Worker("LinuxBuilder", password),
worker.Worker("WindowsBuilder", password), worker.Worker("WindowsBuilder", password),
worker.Worker("AndroidCMakeBuilder", password), worker.Worker("AndroidBuilder_v7", password),
worker.Worker("AndroidBuilder_v8", password),
worker.Worker("LinuxCMakeBuilder", password), worker.Worker("LinuxCMakeBuilder", password),
worker.Worker("WindowsCMakeBuilder", password), worker.Worker("WindowsCMakeBuilder", password),
worker.Worker("RepoGen", password), worker.Worker("RepoGen", password),

25
BuildBotLib/cmake.py
View File

@ -54,7 +54,7 @@ class CMake(Make):
return ' '.join(options) return ' '.join(options)
def androidXmakeCmd(self, props): def androidXmakeMultiAbiCmd(self, props):
file = self.home + "/buildBotSecret/secret.json" file = self.home + "/buildBotSecret/secret.json"
secret = SecretManager(file, props) secret = SecretManager(file, props)
toochainFile = 'build/cmake/android.toolchain.cmake' toochainFile = 'build/cmake/android.toolchain.cmake'
@ -76,6 +76,29 @@ class CMake(Make):
return ' '.join(options) return ' '.join(options)
def androidXmakeSinglAbiCmd(self, props):
file = self.home + "/buildBotSecret/secret.json"
secret = SecretManager(file, props)
toochainFile = 'build/cmake/android.toolchain.cmake'
options = [
'cmake -GNinja',
'-DCMAKE_PREFIX_PATH=$QTDIR',
'-DQT_QMAKE_EXECUTABLE=$QTDIR/bin/qmake',
'-DANDROID_ABI=$ANDROID_ABI',
'-DCMAKE_FIND_ROOT_PATH=$QTDIR',
'-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/' + toochainFile,
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"',
'-B cmake_build'
]
return ' '.join(options)
def androidXmakeCmd(self, props):
return self.androidXmakeSinglAbiCmd(props)
def wasmXmakeCmd(self, props): def wasmXmakeCmd(self, props):
options = [ options = [
'cmake -DCMAKE_PREFIX_PATH=$QTDIR', 'cmake -DCMAKE_PREFIX_PATH=$QTDIR',

8
BuildBotLib/docs.py
View File

@ -1,7 +1,7 @@
# This Python file uses the following encoding: utf-8 # This Python file uses the following encoding: utf-8
from BuildBotLib.cmake import CMake from BuildBotLib.cmake import CMake
from buildbot.plugins import util, steps from buildbot.plugins import util
class Docs(CMake): class Docs(CMake):
@ -34,9 +34,9 @@ class Docs(CMake):
return 'mv docs ' + str(props.getProperty('copyFolder')) return 'mv docs ' + str(props.getProperty('copyFolder'))
res += [self.generateStep(move, res += [self.generateStep(move,
platform, platform,
'moveDocs', 'moveDocs',
self.isDeploy)] self.isDeploy)]
return res return res

5
master.cfg
View File

@ -35,11 +35,12 @@ repoGen = QIFRepogen()
bot.addBuilder("LinuxBuilder", qmakeLinux) bot.addBuilder("LinuxBuilder", qmakeLinux)
bot.addBuilder("WindowsBuilder", qmakeWindows) bot.addBuilder("WindowsBuilder", qmakeWindows)
bot.addBuilder("AndroidBuilder", qmakeAndroid)
bot.addBuilder("LinuxCMakeBuilder", cmakeLinux) bot.addBuilder("LinuxCMakeBuilder", cmakeLinux)
bot.addBuilder("WindowsCMakeBuilder", cmakeWindows) bot.addBuilder("WindowsCMakeBuilder", cmakeWindows)
bot.addBuilder("AndroidCMakeBuilder", cmakeAndroid)
bot.addBuilder("AndroidBuilder_v7", cmakeAndroid)
bot.addBuilder("AndroidBuilder_v8", cmakeAndroid)
bot.addBuilder("RepoGen", repoGen) bot.addBuilder("RepoGen", repoGen)