Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #28169 - servo:jdm-patch-49, r=jdm

Browse source 
Fix some residual python2isms

Fixes nightly and doc builds.
This commit is contained in:
bors-servo 2021-02-19 17:35:10 -05:00 • committed by GitHub
commit 1b58747ce1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
etc/taskcluster/decision_task.py
View file

@ -8,6 +8,7 @@ import os.path
import decisionlib import decisionlib
import functools import functools
from decisionlib import CONFIG, SHARED from decisionlib import CONFIG, SHARED
from urllib.request import urlopen
def main(task_for): def main(task_for):
@ -240,7 +241,7 @@ def upload_docs():
import urllib, json, os import urllib, json, os
root_url = os.environ["TASKCLUSTER_PROXY_URL"] root_url = os.environ["TASKCLUSTER_PROXY_URL"]
url = root_url + "/api/secrets/v1/secret/project/servo/doc.servo.org" url = root_url + "/api/secrets/v1/secret/project/servo/doc.servo.org"
token = json.load(urllib.urlopen(url))["secret"]["token"] token = json.load(urlopen(url))["secret"]["token"]
open("/root/.git-credentials", "w").write("https://git:%s@github.com/" % token) open("/root/.git-credentials", "w").write("https://git:%s@github.com/" % token)
""") """)
.with_script(""" .with_script("""

2
python/servo/package_commands.py
View file

@ -644,7 +644,7 @@ class PackageCommands(CommandBase):
break break
sha256_digest.update(data) sha256_digest.update(data)
package_hash = sha256_digest.hexdigest() package_hash = sha256_digest.hexdigest()
package_hash_fileobj = io.BytesIO(package_hash) package_hash_fileobj = io.BytesIO(package_hash).encode('utf-8')
latest_hash_upload_key = '{}/servo-latest.{}.sha256'.format(nightly_dir, extension) latest_hash_upload_key = '{}/servo-latest.{}.sha256'.format(nightly_dir, extension)
s3.upload_file(package, BUCKET, package_upload_key) s3.upload_file(package, BUCKET, package_upload_key)