Revert "Update clang_win to yesterday's build (from Chromium)."
This reverts commit cefa808f3f237434139ce5fbbbbaf34cbc90e368.
Reason for revert: Flaky failure: LINK : fatal error LNK1104: cannot open file 'c:\b\s\w\ir\clang_win\lib\clang\6.0.0\lib\windows\clang_rt.ubsan_standalone-x86_64.lib'
Original change's description:
> Update clang_win to yesterday's build (from Chromium).
>
> Change-Id: Iea0f841f7c9a3449213c549ba310ab2a3d928ca2
> Reviewed-on: https://skia-review.googlesource.com/114093
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,mtklein@google.com,benjaminwagner@google.com
Change-Id: I1e738d48f75fbd5878658bc79f3d340dd5acfe0a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/114424
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/assets/clang_win/VERSION b/infra/bots/assets/clang_win/VERSION
index bf0d87a..d8263ee 100644
--- a/infra/bots/assets/clang_win/VERSION
+++ b/infra/bots/assets/clang_win/VERSION
@@ -1 +1 @@
-4
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/infra/bots/assets/clang_win/create.py b/infra/bots/assets/clang_win/create.py
index 3249d1a..9b85378 100755
--- a/infra/bots/assets/clang_win/create.py
+++ b/infra/bots/assets/clang_win/create.py
@@ -16,7 +16,7 @@
import utils
-CLANG_REVISION = '327266'
+CLANG_REVISION = '318667'
CLANG_SUB_REVISION = '1'
CLANG_PKG_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
GS_URL = ('https://commondatastorage.googleapis.com/chromium-browser-clang'
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 96e158b..8146abd 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5315,7 +5315,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5349,7 +5349,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5383,7 +5383,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5417,7 +5417,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5451,7 +5451,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5485,7 +5485,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5520,7 +5520,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5554,7 +5554,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5588,7 +5588,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [
@@ -5622,7 +5622,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:4"
+ "version": "version:2"
}
],
"dependencies": [