[Baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI (#11496)

* [baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI

* Remove itk:x64-osx=fail in CI

* Resolve conflicts

* Rebase the changes
This commit is contained in:
Phoebe 2020-05-24 03:39:26 +08:00 committed by GitHub
parent c4937039b0
commit 2ac2b5f3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: microsoft-signalr
Version: 0.1.0-alpha1
Version: 0.1.0-alpha1-1
Description: C++ Client for ASP.NET Core SignalR.
Default-Features: default-features
Homepage: https://github.com/aspnet/SignalR-Client-Cpp

View File

@ -1,5 +1,5 @@
Source: signalrclient
Version: 1.0.0-beta1-8
Version: 1.0.0-beta1-9
Build-Depends: cpprestsdk[default-features,websockets], openssl
Homepage: https://github.com/aspnet/SignalR-Client-Cpp
Description: C++ client for SignalR.

View File

@ -176,6 +176,14 @@ boost-test:arm-uwp=fail
boost-test:x64-uwp=fail
boost-wave:arm-uwp=fail
boost-wave:x64-uwp=fail
# Building boost-* with arm-uwp requires the x86-windows boost-* which breaks CI testing, Ignore them
boost-atomic:arm-uwp=ignore
boost-signals:arm-uwp=ignore
boost-exception:arm-uwp=ignore
boost-regex:arm-uwp=ignore
boost-nowide:arm-uwp=ignore
boost-system:arm-uwp=ignore
boost-container:arm-uwp=ignore
botan:arm64-windows=fail
botan:arm-uwp=fail
botan:x64-uwp=fail
@ -1091,6 +1099,15 @@ miniupnpc:arm-uwp=fail
miniupnpc:x64-uwp=fail
minizip:arm-uwp=fail
minizip:x64-uwp=fail
# Conflicts with signalrclient
microsoft-signalr:arm64-windows=skip
microsoft-signalr:arm-uwp=skip
microsoft-signalr:x64-linux=skip
microsoft-signalr:x64-osx=skip
microsoft-signalr:x64-uwp=skip
microsoft-signalr:x64-windows=skip
microsoft-signalr:x64-windows-static=skip
microsoft-signalr:x86-windows=skip
# conflicts with stb
mlpack:x86-windows=skip
mlpack:x64-windows=skip