diff options
| -rw-r--r-- | etc/taskcluster/decision_task.py | 13 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 10 |
2 files changed, 14 insertions, 9 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 4ef0a73f9bf..55c4002bd7c 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -374,17 +374,14 @@ def android_x86_wpt(): ) -def appx_artifact(debug, platforms): +def appx_artifact(debug): return '/'.join([ 'repo', 'support', 'hololens', 'AppPackages', 'ServoApp', - 'ServoApp_1.0.0.0_%sTest' % ('Debug_' if debug else ''), - 'ServoApp_1.0.0.0_%s%s.appxbundle' % ( - '_'.join(platforms), '_Debug' if debug else '' - ), + 'ServoApp_1.0.0.0_%sTest.zip' % ('Debug_' if debug else ''), ]) @@ -396,7 +393,7 @@ def windows_arm64(): "python mach build --dev --uwp --win-arm64", "python mach package --dev --target aarch64-pc-windows-msvc --uwp=arm64", ) - .with_artifacts(appx_artifact(debug=True, platforms=['arm64'])) + .with_artifacts(appx_artifact(debug=True)) .find_or_create("build.windows_uwp_arm64_dev." + CONFIG.task_id()) ) @@ -409,7 +406,7 @@ def windows_uwp_x64(): "mach build --dev --uwp", "mach package --dev --uwp=x64", ) - .with_artifacts(appx_artifact(debug=True, platforms=['x64'])) + .with_artifacts(appx_artifact(debug=True)) .find_or_create("build.windows_uwp_x64_dev." + CONFIG.task_id()) ) @@ -426,7 +423,7 @@ def uwp_nightly(): "mach package --release --uwp=x64 --uwp=arm64", "mach upload-nightly uwp --secret-from-taskcluster", ) - .with_artifacts(appx_artifact(debug=False, platforms=['x64', 'arm64'])) + .with_artifacts(appx_artifact(debug=False)) .with_max_run_time_minutes(3 * 60) .find_or_create("build.windows_uwp_nightlies." + CONFIG.task_id()) ) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index d8dbc49b117..c487a8c290d 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -68,7 +68,7 @@ PACKAGES = { r'target\release\msi\Servo.zip', ], 'uwp': [ - r'support\hololens\AppPackages\ServoApp\ServoApp_1.0.0.0_Test\ServoApp_1.0.0.0_x64_arm64.appxbundle', + r'support\hololens\AppPackages\ServoApp\ServoApp_1.0.0.0_Test.zip', ], } @@ -766,3 +766,11 @@ def build_uwp(platforms, dev, msbuild_dir): # Generate an appxbundle. subprocess.check_call([msbuild, "/m", build_file.name]) os.unlink(build_file.name) + + print("Creating ZIP") + out_dir = path.join(os.getcwd(), 'support', 'hololens', 'AppPackages', 'ServoApp') + name = 'ServoApp_1.0.0.0_%sTest' % ('Debug_' if dev else '') + artifacts_dir = path.join(out_dir, name) + zip_path = path.join(out_dir, name + ".zip") + archive_deterministically(artifacts_dir, zip_path, prepend_path='servo/') + print("Packaged Servo into " + zip_path) |