aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLaurens Voerman <l.voerman@rug.nl>2019-12-16 13:32:00 +0100
committerLaurens Voerman <l.voerman@rug.nl>2019-12-16 13:32:00 +0100
commit23104e2aa49ce85e5d24c27760dadafef048f930 (patch)
treebea77e8656f69b929840eeb78335ef00559602d3 /scripts
parent266622abe6d90b52adfe07d00d64b4d376059489 (diff)
downloadvcpkg-23104e2aa49ce85e5d24c27760dadafef048f930.tar.gz
vcpkg-23104e2aa49ce85e5d24c27760dadafef048f930.zip
skip ogre-next instead of skipping ogre
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci.baseline.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d83a85039..513ba6bbd 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1153,15 +1153,15 @@ ogdf:x64-uwp = skip
ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf:x86-windows = skip
-# Conflicts with ogre-next
-ogre:arm64-windows = skip
-ogre:arm-uwp = skip
-ogre:x64-osx = skip
-ogre:x64-linux = skip
-ogre:x64-uwp = skip
-ogre:x64-windows = skip
-ogre:x64-windows-static = skip
-ogre:x86-windows = skip
+# Conflicts with ogre
+ogre-next:arm64-windows = skip
+ogre-next:arm-uwp = skip
+ogre-next:x64-osx = skip
+ogre-next:x64-linux = skip
+ogre-next:x64-uwp = skip
+ogre-next:x64-windows = skip
+ogre-next:x64-windows-static = skip
+ogre-next:x86-windows = skip
ois:arm64-windows=fail
ois:arm-uwp=fail
ois:x64-uwp=fail