aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2020-09-01 08:12:01 +0800
committerGitHub <noreply@github.com>2020-08-31 17:12:01 -0700
commit913c7f91cef7f0688a59b51e3ada8b191458e2a5 (patch)
treea79b6aa1c2095473a74cd160d9ea81e0d940e86f /scripts
parentf13b6b1354213f02a347d6fc4630492ab3ae00f5 (diff)
downloadvcpkg-913c7f91cef7f0688a59b51e3ada8b191458e2a5.tar.gz
vcpkg-913c7f91cef7f0688a59b51e3ada8b191458e2a5.zip
[clapack, lapack-reference] Add conflict messages (#13200)
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci.baseline.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b8a17988f..c2fa7b664 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -212,12 +212,14 @@ civetweb:arm64-windows = skip
civetweb:arm-uwp = skip
civetweb:x64-uwp = skip
# clapack is replaced by lapack-reference.
-clapack:x64-linux = skip
-clapack:x64-osx = skip
-clapack:x64-windows = skip
-clapack:x64-windows-static = skip
-clapack:x86-windows = skip
-clapack:x64-uwp=fail
+clapack:arm64-windows=skip
+clapack:arm-uwp=skip
+clapack:x64-linux=skip
+clapack:x64-osx=skip
+clapack:x64-uwp=skip
+clapack:x64-windows-static=skip
+clapack:x64-windows=skip
+clapack:x86-windows=skip
clblas:arm64-windows=fail
clblast:x64-linux=fail
clblast:x64-windows-static=fail