aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci.baseline.txt12
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 801a5a58e..62af21fe8 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
@@ -1135,8 +1127,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