diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-03-14 17:20:08 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-14 17:20:13 +0000 |
| commit | 2f2419b936150e24ca1aea891ba405c8ea8ebdc7 (patch) | |
| tree | ecf761d6a5f941a925c32e994326920a1b2de0a2 /infra/bots/tasks.json | |
| parent | e462b80d966f006c5164f1cad90f79d916b61a6b (diff) | |
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 <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
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 <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/tasks.json')
| -rw-r--r-- | infra/bots/tasks.json | 73 |
1 files changed, 33 insertions, 40 deletions
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 06f05c9474..4c02b13062 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -461,12 +461,6 @@ "Build-Win-Clang-x86-Debug" ] }, - "Build-Win-Clang-x86-Debug-Exceptions": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86-Debug-Exceptions" - ] - }, "Build-Win-Clang-x86-Release": { "priority": 0.8, "tasks": [ @@ -527,6 +521,12 @@ "Build-Win-MSVC-x86-Debug" ] }, + "Build-Win-MSVC-x86-Debug-Exceptions": { + "priority": 0.8, + "tasks": [ + "Build-Win-MSVC-x86-Debug-Exceptions" + ] + }, "Build-Win-MSVC-x86-Release": { "priority": 0.8, "tasks": [ @@ -5398,40 +5398,6 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, - "Build-Win-Clang-x86-Debug-Exceptions": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highcpu-64", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86-Debug-Exceptions", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, "Build-Win-Clang-x86-Release": { "cipd_packages": [ { @@ -5767,6 +5733,33 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, + "Build-Win-MSVC-x86-Debug-Exceptions": { + "dependencies": [ + "Housekeeper-PerCommit-IsolateWinToolchain" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "machine_type:n1-highcpu-64", + "os:Windows-2016Server-14393", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86-Debug-Exceptions", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, "Build-Win-MSVC-x86-Release": { "dependencies": [ "Housekeeper-PerCommit-IsolateWinToolchain" |