Bug 1340564: specify the target name explicitly for dependent tasks; r=gps

MozReview-Commit-ID: D7TeFDmXeVr

--HG--
extra : rebase_source : 6fc2ec87009a3a898107c12713376246a7f4224b
This commit is contained in:
Dustin J. Mitchell 2017-04-25 22:30:09 +00:00
parent 1eb1ff26f6
commit 13fc1951ed
2 changed files with 5 additions and 8 deletions

View File

@ -18,4 +18,6 @@ jobs-from:
# This is used by run-task based tasks to lookup which build task it
# should depend on based on its own platform.
dependent-build-platforms:
linux64.*: build-linux64/opt
linux64.*:
label: build-linux64/opt
target-name: target.tar.bz2

View File

@ -73,16 +73,11 @@ def add_build_dependency(config, job, taskdesc):
if len(matches) > 1:
raise Exception("More than one build platform found for '{}'.".format(key))
label = matches[0]
label = matches[0]['label']
target = matches[0]['target-name']
deps = taskdesc.setdefault('dependencies', {})
deps.update({'build': label})
if 'macosx' in label:
target = 'target.dmg'
elif 'android' in label:
target = 'target.apk'
else:
target = 'target.tar.bz2'
build_artifact = 'public/build/{}'.format(target)
installer_url = ARTIFACT_URL.format('<build>', build_artifact)