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

build: include buildserverid on wiki build logs, if it exists

Browse Source 
When `fdroid build` is run using the buildserver, it should fetch the
buildserverid on the first build.

Seems this was really a silly bug in 837fc99d74
This commit is contained in:
Hans-Christoph Steiner 2018-01-03 13:58:06 +01:00
parent 444ae95380
commit 54965455b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/build.py
View File

@ -79,6 +79,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c', buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
'cat /home/vagrant/buildserverid'], 'cat /home/vagrant/buildserverid'],
cwd='builder').rstrip() cwd='builder').rstrip()
logging.debug(_('Fetched buildserverid from VM: ') + buildserverid)
# Open SSH connection... # Open SSH connection...
logging.info("Connecting to virtual machine...") logging.info("Connecting to virtual machine...")
@ -1306,7 +1307,7 @@ def main():
+ "* this build completed at " + _get_build_timestamp() + '\n' \ + "* this build completed at " + _get_build_timestamp() + '\n' \
+ '* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \ + '* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
+ fdroidserverid + ' ' + fdroidserverid + ']\n\n' + fdroidserverid + ' ' + fdroidserverid + ']\n\n'
if options.onserver: if buildserverid:
txt += '* buildserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \ txt += '* buildserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
+ buildserverid + ' ' + buildserverid + ']\n\n' + buildserverid + ' ' + buildserverid + ']\n\n'
txt += tools_version_log + '\n\n' txt += tools_version_log + '\n\n'