diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2021-05-23 10:49:01 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2021-05-23 11:16:09 -0400 |
| commit | a82b268be0ee7cdcee26d53c853dbf447dd71d91 (patch) | |
| tree | 45a316a934fae670f64fa4333d4a67c2c6c74af4 /python/servo/package_commands.py | |
| parent | 84c8653d7e55c6cf660e53e10404ac695368ca4e (diff) | |
| download | servo-a82b268be0ee7cdcee26d53c853dbf447dd71d91.tar.gz servo-a82b268be0ee7cdcee26d53c853dbf447dd71d91.zip | |
Convert more taskcluster jobs to Github Actions.
Diffstat (limited to 'python/servo/package_commands.py')
| -rw-r--r-- | python/servo/package_commands.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 02c29ba4d23..280fe782481 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -601,7 +601,10 @@ class PackageCommands(CommandBase): @CommandArgument('--secret-from-taskcluster', action='store_true', help='Retrieve the appropriate secrets from taskcluster.') - def upload_nightly(self, platform, secret_from_taskcluster): + @CommandArgument('--secret-from-environment', + action='store_true', + help='Retrieve the appropriate secrets from the environment.') + def upload_nightly(self, platform, secret_from_taskcluster, secret_from_environment): import boto3 def get_s3_secret(): @@ -611,6 +614,10 @@ class PackageCommands(CommandBase): secret = get_taskcluster_secret("s3-upload-credentials") aws_access_key = secret["aws_access_key_id"] aws_secret_access_key = secret["aws_secret_access_key"] + elif secret_from_environment: + secret = json.loads(os.environ['S3_UPLOAD_CREDENTIALS']) + aws_access_key = secret["aws_access_key_id"] + aws_secret_access_key = secret["aws_secret_access_key"] return (aws_access_key, aws_secret_access_key) def nightly_filename(package, timestamp): |