Auto merge of #28206 - servo:jdm-patch-46, r=SimonSapin

Fix UWP nightly build and docs build.
This commit is contained in:
bors-servo 2021-02-25 16:20:37 -05:00 committed by GitHub
commit f2c437a77b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -238,7 +238,7 @@ def upload_docs():
.with_features("taskclusterProxy") .with_features("taskclusterProxy")
.with_scopes("secrets:get:project/servo/doc.servo.org") .with_scopes("secrets:get:project/servo/doc.servo.org")
.with_env(PY="""if 1: .with_env(PY="""if 1:
import urllib, json, os import urllib.request, 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.request.urlopen(url))["secret"]["token"] token = json.load(urllib.request.urlopen(url))["secret"]["token"]
@ -356,10 +356,10 @@ def uwp_nightly(rdp=False):
"secrets:get:project/servo/windows-codesign-cert/latest", "secrets:get:project/servo/windows-codesign-cert/latest",
) )
.with_script( .with_script(
"python3 mach build --release --target=x86_64-uwp-windows-msvc", "python mach build --release --target=x86_64-uwp-windows-msvc",
"python3 mach build --release --target=aarch64-uwp-windows-msvc", "python mach build --release --target=aarch64-uwp-windows-msvc",
"python3 mach package --release --target=x86_64-uwp-windows-msvc --uwp=x64 --uwp=arm64", "python mach package --release --target=x86_64-uwp-windows-msvc --uwp=x64 --uwp=arm64",
"python3 mach upload-nightly uwp --secret-from-taskcluster", "python mach upload-nightly uwp --secret-from-taskcluster",
) )
.with_artifacts(appx_artifact) .with_artifacts(appx_artifact)
.with_max_run_time_minutes(3 * 60) .with_max_run_time_minutes(3 * 60)