Skip to content
Permalink
Browse files

Add CI artifacts and nightly build for UWP.

  • Loading branch information...
jdm committed Sep 5, 2019
1 parent 11e5334 commit b80092eb29ef67e3ece85610a56e6cab0258e8f9
Showing with 11 additions and 5 deletions.
  1. +4 −2 etc/taskcluster/decision_task.py
  2. +7 −3 python/servo/package_commands.py
@@ -55,7 +55,7 @@ def main(task_for):

"try-mac": [macos_unit],
"try-linux": [linux_tidy_unit_docs, linux_release],
"try-windows": [windows_unit, windows_arm64, windows_uwp_x64],
"try-windows": [windows_unit, windows_arm64, windows_uwp_x64, uwp_nightly],
"try-magicleap": [magicleap_dev],
"try-arm": [windows_arm64],
"try-wpt": [linux_wpt],
@@ -92,6 +92,7 @@ def main(task_for):
macos_nightly()
update_wpt()
magicleap_nightly()
uwp_nightly()


# These are disabled in a "real" decision task,
@@ -409,10 +410,11 @@ def uwp_nightly():
"mach build --release --uwp",
"python mach build --release --uwp --win-arm64",
"mach package --release --uwp=x64 --uwp=arm64",
"#mach upload-nightly uwp --secret-from-taskcluster",
"mach upload-nightly uwp --secret-from-taskcluster",
)
.with_artifacts('repo/support/hololens/AppPackages/ServoApp/ServoApp_1.0.0.0_Test/ServoApp_1.0.0.0_x64_arm64.appxbundle')
.find_or_create("build.windows_uwp_nightlies." + CONFIG.task_id())
.with_max_run_time_minutes(3 * 60)
)


@@ -68,6 +68,9 @@
r'target\release\msi\Servo.exe',
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',
],
}


@@ -205,9 +208,10 @@ class PackageCommands(CommandBase):
help='Create a local Maven repository')
@CommandArgument('--uwp',
default=None,
action='append',
help='Create an APPX package')
def package(self, release=False, dev=False, android=None, magicleap=None, debug=False,
debugger=None, target=None, flavor=None, maven=False, uwp=False):
debugger=None, target=None, flavor=None, maven=False, uwp=None):
if android is None:
android = self.config["build"]["android"]
if target and android:
@@ -223,12 +227,12 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug=
if magicleap:
target = "aarch64-linux-android"
env = self.build_env(target=target)
binary_path = self.get_binary_path(release, dev, target=target, android=android, magicleap=magicleap)
binary_path = self.get_binary_path(release, dev, target=target, android=android, magicleap=magicleap, simpleservo=uwp is not None)
dir_to_root = self.get_top_dir()
target_dir = path.dirname(binary_path)
if uwp:
vs_info = self.vs_dirs()
build_uwp(target or 'x86_64-pc-windows-msvc', dev, vs_info['msbuild'])
build_uwp(uwp, dev, vs_info['msbuild'])
elif magicleap:
if platform.system() not in ["Darwin"]:
raise Exception("Magic Leap builds are only supported on macOS.")

0 comments on commit b80092e

Please sign in to comment.
You can’t perform that action at this time.