Compare commits

...

2 Commits

Author SHA1 Message Date
Josh Matthews
522b4afd7a Ignore gstreamer packaging errors on Appveyor. 2019-07-12 07:49:01 -04:00
Josh Matthews
ad615fa07e Add build option to ignore packaging errors. 2019-07-12 07:49:01 -04:00
2 changed files with 8 additions and 3 deletions

View File

@@ -74,7 +74,8 @@ build_script:
- mach clean-nightlies --keep 2 --force
# see https://github.com/servo/servo/issues/20664
#- mach cargo check -p compositing --no-default-features
- mach build -d -v
# see https://github.com/servo/servo/issues/23749
- mach build --ignore-gstreamer-package-errors -d -v
- mach test-unit
test: off

View File

@@ -164,13 +164,16 @@ class MachCommands(CommandBase):
@CommandArgument('--very-verbose', '-vv',
action='store_true',
help='Print very verbose output')
@CommandArgument('--ignore-gstreamer-package-errors',
action='store_true',
help='Do not fail the build for errors packaging GStreamer binaries')
@CommandArgument('params', nargs='...',
help="Command-line arguments to be passed through to Cargo")
@CommandBase.build_like_command_arguments
def build(self, release=False, dev=False, jobs=None, params=None,
no_package=False, verbose=False, very_verbose=False,
target=None, android=False, magicleap=False, libsimpleservo=False, uwp=False,
features=None, **kwargs):
features=None, ignore_gstreamer_package_errors=False, **kwargs):
opts = params or []
features = features or []
target, android = self.pick_target_triple(target, android, magicleap)
@@ -606,7 +609,8 @@ class MachCommands(CommandBase):
target_triple = target or host_triple()
if "aarch64" not in target_triple:
print("Packaging gstreamer DLLs")
if not package_gstreamer_dlls(servo_exe_dir, target_triple):
if not package_gstreamer_dlls(servo_exe_dir, target_triple) and \
not ignore_gstreamer_package_errors:
status = 1
print("Packaging MSVC DLLs")
if not package_msvc_dlls(servo_exe_dir, target_triple):