From cb69ce3a36418a2e29733ecd19ab0a772cbd336e Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Tue, 18 Dec 2018 17:26:41 +0000 Subject: [PATCH] Bug 1492664 - update diffoscope tasks to use TASKCLUSTER_ROOT_URL; r=glandium Differential Revision: https://phabricator.services.mozilla.com/D14211 --HG-- extra : moz-landing-system : lando --- taskcluster/docker/diffoscope/get_and_diffoscope | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/taskcluster/docker/diffoscope/get_and_diffoscope b/taskcluster/docker/diffoscope/get_and_diffoscope index c0cd00406687..f22e4908e07a 100644 --- a/taskcluster/docker/diffoscope/get_and_diffoscope +++ b/taskcluster/docker/diffoscope/get_and_diffoscope @@ -11,6 +11,13 @@ mkdir a b # implemented, it's better to first manually extract the data. # Plus dmg files are not supported yet. +# duplicate the functionality of taskcluster-lib-urls, but in bash.. +if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then + queue_base='https://queue.taskcluster.net/v1' +else + queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1" +fi + case "$ORIG_URL" in */target.zip|*/target.apk) curl -sL "$ORIG_URL" > a.zip @@ -26,7 +33,7 @@ case "$ORIG_URL" in # We don't have mach available to call mach artifact toolchain. # This is the trivial equivalent for those toolchains we use here. for t in $MOZ_TOOLCHAINS; do - curl -sL https://queue.taskcluster.net/v1/task/${t#*@}/artifacts/${t%@*} | tar -Jxf - + curl -sL $queue_base/task/${t#*@}/artifacts/${t%@*} | tar -Jxf - done for tool in lipo otool; do ln -s /builds/worker/cctools/bin/x86_64-apple-darwin*-$tool bin/$tool