From e308474b85ff49f2b688a759351c4ec569636910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 17 Dec 2019 02:18:47 +0800 Subject: [PATCH] Update baseline to skip ogre conflicts (#9331) * update baseline * Replace ogre with ogre-next in baseline results --- scripts/ci.baseline.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index febccd2fe2..cda57fc22b 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