mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-01 00:30:13 +02:00
build: include buildserverid on wiki build logs, if it exists
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:
parent
444ae95380
commit
54965455b1
@ -79,6 +79,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
|
||||
buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
|
||||
'cat /home/vagrant/buildserverid'],
|
||||
cwd='builder').rstrip()
|
||||
logging.debug(_('Fetched buildserverid from VM: ') + buildserverid)
|
||||
|
||||
# Open SSH connection...
|
||||
logging.info("Connecting to virtual machine...")
|
||||
@ -1306,7 +1307,7 @@ def main():
|
||||
+ "* this build completed at " + _get_build_timestamp() + '\n' \
|
||||
+ '* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
|
||||
+ fdroidserverid + ' ' + fdroidserverid + ']\n\n'
|
||||
if options.onserver:
|
||||
if buildserverid:
|
||||
txt += '* buildserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \
|
||||
+ buildserverid + ' ' + buildserverid + ']\n\n'
|
||||
txt += tools_version_log + '\n\n'
|
||||
|
Loading…
Reference in New Issue
Block a user