diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-05-24 03:39:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 12:39:26 -0700 |
| commit | 2ac2b5f3da6b46ff2ae900550bd7c44f39c57dcd (patch) | |
| tree | be824e653d0da1581506b1918f26a0f1bfaa0cc6 | |
| parent | c4937039b0704c711dff11ffa729f1c105b20e42 (diff) | |
| download | vcpkg-2ac2b5f3da6b46ff2ae900550bd7c44f39c57dcd.tar.gz vcpkg-2ac2b5f3da6b46ff2ae900550bd7c44f39c57dcd.zip | |
[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
| -rw-r--r-- | ports/microsoft-signalr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/signalrclient/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 73f10bb2b..0cec60bf9 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -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
diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL index d8939e177..7b9d0bc12 100644 --- a/ports/signalrclient/CONTROL +++ b/ports/signalrclient/CONTROL @@ -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. diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4963f063d..5d6ada674 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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
|