aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-07 09:39:54 -0400
committerGitHub <noreply@github.com>2019-05-07 09:39:54 -0400
commit90dfeab0f01544d41dc6b5cb99eeec804336b46e (patch)
tree4605e8ea472158e4bcf9840db690ccab66c9e214 /python
parent7e8e3fe4de66541ee8ad0f27dade08b39f6ea23a (diff)
parentfbc9275f630367de934d64137d9a3112d20c610c (diff)
downloadservo-90dfeab0f01544d41dc6b5cb99eeec804336b46e.tar.gz
servo-90dfeab0f01544d41dc6b5cb99eeec804336b46e.zip
Auto merge of #23327 - servo:daily, r=jdm
Fix Servo Nightly uploads CC https://github.com/servo/servo/issues/23320. Closes https://github.com/servo/servo/pull/23326. Tasks running with this configuration, all green except the last which is still running as of this writing: * Windows: https://tools.taskcluster.net/groups/dZvq6KJpQVSTzrnKwA5JQg/tasks/RaEwj-wWRSm1qmNytjAG8A/details * Linux: https://tools.taskcluster.net/groups/JU6A3xS2TTq4dTL3LY39QQ/tasks/YDbSZr9wTHq6U3obG3ZstQ/details * Android: https://tools.taskcluster.net/groups/FkLah26vSIyKDUwfADUkGw/tasks/JNokEsu2SCmAGL3ZK2Uj7g/details * macOS: https://tools.taskcluster.net/groups/CtheiEigRYinJjqYlDMuZQ/tasks/XPqUzikPQnybmc6wP8AL-w/details * WPT update: https://tools.taskcluster.net/groups/JU6A3xS2TTq4dTL3LY39QQ/tasks/MNutIoMWT9KvB19TS2FsXA/details <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23327) <!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r--python/servo/package_commands.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 8ff1170872d..12ab0607a3a 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -546,7 +546,11 @@ class PackageCommands(CommandBase):
import boto3
def get_taskcluster_secret(name):
- url = os.environ["TASKCLUSTER_PROXY_URL"] + "/secrets/v1/secret/project/servo/" + name
+ url = (
+ os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") +
+ "/secrets/v1/secret/project/servo/" +
+ name
+ )
return json.load(urllib.urlopen(url))["secret"]
def get_s3_secret():