kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

log Android SDK/NDK component versions on buildserver

Browse Source 
ad2b9b99c2 put this in the wrong place, it
was running it on the buildserver host rather than in the buildserver VM
itself, where the builds actually run.

refs #148
This commit is contained in:
Hans-Christoph Steiner 2017-02-09 23:48:40 +01:00
parent 0cf08de347
commit 57c3ba413c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdroidserver/build.py
View File

@ -389,7 +389,10 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
cmdline += ' --verbose' cmdline += ' --verbose'
cmdline += " %s:%s" % (app.id, build.vercode) cmdline += " %s:%s" % (app.id, build.vercode)
chan.exec_command('bash --login -c "' + cmdline + '"') chan.exec_command('bash --login -c "' + cmdline + '"')
output = bytes() output = bytes()
output += b'== Installed Android Tools ==\n\n'
output += get_android_tools_version_log(build.ndk_path()).encode()
while not chan.exit_status_ready(): while not chan.exit_status_ready():
while chan.recv_ready(): while chan.recv_ready():
output += chan.recv(1024) output += chan.recv(1024)
@ -952,9 +955,11 @@ def trybuild(app, build, build_dir, output_dir, also_check_dir, srclib_dir, extl
return True return True
def get_android_tools_versions(sdk_path, ndk_path=None): def get_android_tools_versions(ndk_path=None):
'''get a list of the versions of all installed Android SDK/NDK components''' '''get a list of the versions of all installed Android SDK/NDK components'''
global config
sdk_path = config['sdk_path']
if sdk_path[-1] != '/': if sdk_path[-1] != '/':
sdk_path += '/' sdk_path += '/'
components = [] components = []
@ -976,10 +981,10 @@ def get_android_tools_versions(sdk_path, ndk_path=None):
return components return components
def get_android_tools_version_log(sdk_path, ndk_path): def get_android_tools_version_log(ndk_path):
'''get a list of the versions of all installed Android SDK/NDK components''' '''get a list of the versions of all installed Android SDK/NDK components'''
log = '' log = ''
components = get_android_tools_versions(sdk_path, ndk_path) components = get_android_tools_versions(ndk_path)
for name, version in sorted(components): for name, version in sorted(components):
log += '* ' + name + ' (' + version + ')\n' log += '* ' + name + ' (' + version + ')\n'
@ -1137,7 +1142,7 @@ def main():
for build in app.builds: for build in app.builds:
wikilog = None wikilog = None
tools_version_log = '== Installed Android Tools ==\n\n' tools_version_log = '== Installed Android Tools ==\n\n'
tools_version_log += get_android_tools_version_log(config['sdk_path'], build.ndk_path()) tools_version_log += get_android_tools_version_log(build.ndk_path())
try: try:
# For the first build of a particular app, we need to set up # For the first build of a particular app, we need to set up