From 2f2419b936150e24ca1aea891ba405c8ea8ebdc7 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 14 Mar 2018 17:20:08 +0000 Subject: Revert "Switch Win Exceptions Build to Clang." This reverts commit e1cb4778c70a6bef543a8936c5521a71a037f551. Reason for revert: Need to revert dependency https://skia-review.googlesource.com/c/skia/+/114093 Original change's description: > Switch Win Exceptions Build to Clang. > > No-Try: true > Change-Id: I119c7853299b6eef65f991b41cbb2afb0a35f431 > Reviewed-on: https://skia-review.googlesource.com/113673 > Commit-Queue: Ben Wagner > Reviewed-by: Mike Klein TBR=mtklein@google.com,benjaminwagner@google.com Change-Id: I36f4c6cdf890043d4b77b8d5347b4752f58ebd33 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/114420 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- infra/bots/jobs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'infra/bots/jobs.json') diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index ae21c46cd3..371ccf6955 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -75,7 +75,6 @@ "Build-Mac-Clang-x86_64-Release-TSAN", "Build-Win-Clang-arm64-Release-Android", "Build-Win-Clang-x86-Debug", - "Build-Win-Clang-x86-Debug-Exceptions", "Build-Win-Clang-x86-Release", "Build-Win-Clang-x86_64-Debug", "Build-Win-Clang-x86_64-Debug-ANGLE", @@ -86,6 +85,7 @@ "Build-Win-Clang-x86_64-Release-UBSAN", "Build-Win-Clang-x86_64-Release-Vulkan", "Build-Win-MSVC-x86-Debug", + "Build-Win-MSVC-x86-Debug-Exceptions", "Build-Win-MSVC-x86-Release", "Build-Win-MSVC-x86_64-Debug", "Build-Win-MSVC-x86_64-Debug-Vulkan", @@ -475,8 +475,8 @@ "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", - "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", -- cgit v1.2.3