aboutsummaryrefslogtreecommitdiff
path: root/scripts/ci.baseline.txt
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2019-12-17 02:18:47 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-12-16 10:18:47 -0800
commite308474b85ff49f2b688a759351c4ec569636910 (patch)
tree27659beeead5232a75b4b2b16fd6259f6b8e5932 /scripts/ci.baseline.txt
parentdafe7f9d9a9a7b644b39dcec68cb345228fa388f (diff)
downloadvcpkg-e308474b85ff49f2b688a759351c4ec569636910.tar.gz
vcpkg-e308474b85ff49f2b688a759351c4ec569636910.zip
Update baseline to skip ogre conflicts (#9331)
* update baseline * Replace ogre with ogre-next in baseline results
Diffstat (limited to 'scripts/ci.baseline.txt')
-rw-r--r--scripts/ci.baseline.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index febccd2fe..cda57fc22 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1153,6 +1153,15 @@ ogdf:x64-uwp = skip
ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf: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