Skip to content

Commit

Permalink
bug 1595368 - fix esr68 spidermonkey tooltool. r=callek a=release CLO…
Browse files Browse the repository at this point in the history
…SED TREE

Reviewers: callek

Tags: #secure-revision

Bug #: 1595368

Differential Revision: https://phabricator.services.mozilla.com/D52597

--HG--
extra : amend_source : 56857ce721453e59ff63762963a775525c5600f2
extra : absorb_source : fa57564b024610320735b48b5070a92200db7f98
extra : histedit_source : 920610e119245f5ccf1af9eef9ac7241d1035e21
  • Loading branch information
escapewindow committed Nov 11, 2019
1 parent 0fe89bf commit 87bd0e1
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions taskcluster/taskgraph/transforms/job/spidermonkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

from taskgraph.transforms.job import run_job_using
from taskgraph.transforms.job.common import (
add_tooltool,
docker_worker_add_artifacts,
generic_worker_add_artifacts,
generic_worker_hg_commands,
Expand Down Expand Up @@ -77,6 +78,10 @@ def docker_worker_spidermonkey(config, job, taskdesc):
elif run['using'] == 'spidermonkey-rust-bindings':
script = "build-sm-rust-bindings.sh"

if run['tooltool-downloads']:
internal = run['tooltool-downloads'] == 'internal'
add_tooltool(config, job, taskdesc, internal=internal)

worker['command'] = [
'{workdir}/bin/run-task'.format(**run),
'--gecko-checkout', '{workdir}/workspace/build/src'.format(**run),
Expand Down Expand Up @@ -127,6 +132,10 @@ def generic_worker_spidermonkey(config, job, taskdesc):
# Don't allow untested configurations yet
raise Exception("spidermonkey-rust-bindings is not a supported configuration")

if run['tooltool-downloads']:
internal = run['tooltool-downloads'] == 'internal'
add_tooltool(config, job, taskdesc, internal=internal)

hg_command = generic_worker_hg_commands(
'https://hg.mozilla.org/mozilla-unified',
env['GECKO_HEAD_REPOSITORY'],
Expand Down

0 comments on commit 87bd0e1

Please sign in to comment.