From 266622abe6d90b52adfe07d00d64b4d376059489 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Wed, 11 Dec 2019 10:32:12 +0100 Subject: skip ogre build for all triplets as it conficts with ogre-next --- scripts/ci.baseline.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 94fd57187..d83a85039 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-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 ois:arm64-windows=fail ois:arm-uwp=fail ois:x64-uwp=fail -- cgit v1.2.3