From 54965455b1ea032f6c882d0725405692359cabfc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jan 2018 13:58:06 +0100 Subject: [PATCH] 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 837fc99d74f7694a64f014f3d38a8b07d9e8b3bd --- fdroidserver/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 8bbe8aab..83cb18ab 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -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' -- 2.30.2