diff options
| author | NancyLi1013 <lirui09@beyondsoft.com> | 2020-04-06 19:21:59 -0700 |
|---|---|---|
| committer | NancyLi1013 <lirui09@beyondsoft.com> | 2020-04-06 19:22:19 -0700 |
| commit | 9cbb1bd46e0948374fe496195cca828e68a71f3c (patch) | |
| tree | e65160aa6a3783966bba32283d1dd2a2eb05a41f /scripts/ci.baseline.txt | |
| parent | 0f1294c61e51bba3c4257502852eecbe1a943a4b (diff) | |
| parent | 6c4e822611324de4af9c8bb0ef8094e4a9b30a6e (diff) | |
| download | vcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.tar.gz vcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/NancyLi/10611-fix-mosquitto
# Conflicts:
# ports/libwebsockets/CONTROL
Diffstat (limited to 'scripts/ci.baseline.txt')
| -rw-r--r-- | scripts/ci.baseline.txt | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b3fbb8178..8074c76cf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -63,14 +63,6 @@ ampl-mp:arm-uwp=fail ampl-mp:x64-uwp=fail
angelscript:arm64-windows=fail
angelscript:arm-uwp=fail
-
-# Conflicts with qt5-base and ms-angle
-angle:arm64-windows = skip
-angle:arm-uwp = skip
-angle:x64-uwp = skip
-angle:x64-windows = skip
-angle:x64-windows-static = skip
-angle:x86-windows = skip
antlr4:arm64-windows=fail
antlr4:arm-uwp=fail
antlr4:x64-uwp=fail
@@ -606,8 +598,6 @@ hidapi:x64-uwp=fail hiredis:arm-uwp=fail
hiredis:x64-uwp=fail
hpx:x64-windows-static=fail
-hunspell:x64-linux=fail
-hunspell:x64-osx=fail
hwloc:arm64-windows=fail
hwloc:arm-uwp=fail
hwloc:x64-linux=fail
@@ -751,7 +741,6 @@ libfabric:x64-linux=fail libfabric:x64-osx=fail
libfabric:x64-uwp=fail
libfabric:x64-windows=ignore
-libffi:arm-uwp=fail
libfreenect2:arm64-windows=fail
libgd:x64-linux=ignore
libgit2:arm64-windows=fail
@@ -1137,8 +1126,8 @@ mpir:x64-uwp=fail #Conflicts with angle and qt-5base
ms-angle:arm64-windows = skip
ms-angle:arm-uwp = skip
-ms-angle:x64-linux = fail
-ms-angle:x64-osx = fail
+ms-angle:x64-linux = skip
+ms-angle:x64-osx = skip
ms-angle:x64-uwp = skip
ms-angle:x64-windows = skip
ms-angle:x64-windows-static = skip
@@ -1313,7 +1302,6 @@ openvdb:x64-windows-static=fail openvpn3:x64-osx=fail
openvr:arm64-windows=fail
openvr:arm-uwp=fail
-openvr:x64-linux=fail
openvr:x64-osx=fail
openvr:x64-uwp=fail
openxr-loader:arm64-windows=fail
@@ -1339,6 +1327,7 @@ osgearth:x64-osx=fail osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-windows-static=fail
+osg-qt:x64-linux=ignore
otl:x64-windows=ignore
otl:x64-windows-static=ignore
otl:x64-uwp=ignore
@@ -1535,7 +1524,6 @@ redis-plus-plus:arm64-windows=fail replxx:arm-uwp=fail
replxx:x64-uwp=fail
replxx:arm64-windows=fail
-replxx:x86-windows=fail
reproc:arm-uwp=fail
reproc:x64-uwp=fail
restbed:arm-uwp=fail
|