From d76ab6e42589423ad64598b17b33b0c1b33efca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Wed, 26 Jul 2023 10:25:59 +0200 Subject: [PATCH] Split download and build commands --- master/buildbot/flathub_master.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/master/buildbot/flathub_master.py b/master/buildbot/flathub_master.py index 7ba8da72a7..8c71d102e0 100644 --- a/master/buildbot/flathub_master.py +++ b/master/buildbot/flathub_master.py @@ -966,7 +966,17 @@ def run(self): '--subject', util.Property('flathub_subject'), 'builddir', util.Interpolate('%(prop:flathub_manifest)s')] - rendered=yield self.build.properties.render(command) + download_command = command + ["--download-only"] + command = command + ["--disable-download"] + + download_rendered = yield self.build.properties.render(download_command) + download_cmd = yield self.makeRemoteShellCommand(command=download_rendered) + yield self.runCommand(download_cmd) + + if download_cmd.didFail(): + defer.returnValue(cmd.results()) + + rendered = yield self.build.properties.render(command) cmd = yield self.makeRemoteShellCommand(command=rendered) yield self.runCommand(cmd)