Bug 1362148 - Call generate_build_props() as part of build(); r=ted

Previously, this ran during postflight_build(). The magic postflight_*
methods are called automagically by BaseScript.run_action() and are
only called if the main action method didn't raise. So there should
be no functional difference with this commit.

The reason I changed this is that a subsequent commit will perform
metrics generation from build() and without the build properties
file loaded, at least the OS X 64 opt buildbot build doesn't have
packageFilename defines, which breaks metrics collection.

MozReview-Commit-ID: 54ftuQqGKVi

--HG--
extra : rebase_source : c3c28426468474a7aa51a10787d01ebbba10dd82
extra : source : 387d8415d05e7f1dc96ed3adb441c54f232baf0d
This commit is contained in:
Gregory Szorc 2017-05-04 17:24:06 -07:00
Родитель 31a38cab53
Коммит a4d58c7a0d
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1644,6 +1644,8 @@ or run without that action (ie: --no-{action})"
self.fatal("'mach build' did not run successfully. Please check "
"log for errors.")
self.generate_build_props(console_output=True, halt_on_failure=True)
def multi_l10n(self):
if not self.query_is_nightly():
self.info("Not a nightly build, skipping multi l10n.")
@ -1737,10 +1739,8 @@ or run without that action (ie: --no-{action})"
self._taskcluster_upload(abs_files, self.routes_json['l10n'],
locale='multi')
def postflight_build(self, console_output=True):
def postflight_build(self):
"""grabs properties from post build and calls ccache -s"""
self.generate_build_props(console_output=console_output,
halt_on_failure=True)
# A list of argument lists. Better names gratefully accepted!
mach_commands = self.config.get('postflight_build_mach_commands', [])
for mach_command in mach_commands: