commit 25234a0a9c2ca87f3cdd41fd55241d4358b09544
author Mike Klein <mtklein@google.com> Thu Jan 02 10:13:49 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 02 17:27:47 2020 +0000
tree a085cf0727b723baf341b6738bc890ff6bc7b2ac
parent ec78f685becda099b59d4719bd0ba786bd83015a

update skcms bot packages

Clang + MSVC updates for Linux + Windows.

Change-Id: I97f820afd3e1492e1880fc3e28dc20543c71f224
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/261929
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

infra/bots/bot.py

diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index d2c48a2..0c27ec2 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -77,13 +77,16 @@
 
 else:  # Windows
   win_toolchain = os.path.realpath(sys.argv[2])
-  os.environ['PATH'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64;' + os.environ['PATH']
-  os.environ['INCLUDE'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.16.27023\\include;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17763.0\\shared;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17763.0\\ucrt;'
-  os.environ['INCLUDE'] += win_toolchain + '\\win_sdk\\Include\\10.0.17763.0\\um;'
-  os.environ['LIB'] = win_toolchain + '\\VC\\Tools\\MSVC\\14.16.27023\\lib\\x64;'
-  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.17763.0\\um\\x64;'
-  os.environ['LIB'] += win_toolchain + '\\win_sdk\\Lib\\10.0.17763.0\\ucrt\\x64;'
+  msvc = win_toolchain + '\\VC\\Tools\\MSVC\\14.24.28314\\'
+  sdk  = win_toolchain + '\\win_sdk\\'
+
+  os.environ['PATH'] = msvc + 'bin\\HostX64\\x64;' + os.environ['PATH']
+  os.environ['INCLUDE'] = msvc + 'include;'
+  os.environ['INCLUDE'] += sdk + 'Include\\10.0.17763.0\\shared;'
+  os.environ['INCLUDE'] += sdk + 'Include\\10.0.17763.0\\ucrt;'
+  os.environ['INCLUDE'] += sdk + 'Include\\10.0.17763.0\\um;'
+  os.environ['LIB'] = msvc + 'lib\\x64;'
+  os.environ['LIB'] += sdk + 'Lib\\10.0.17763.0\\um\\x64;'
+  os.environ['LIB'] += sdk + 'Lib\\10.0.17763.0\\ucrt\\x64;'
 
   call('{ninja}\\ninja.exe -C skcms -f msvs.ninja -k 0'.format(ninja=ninja))

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 78b9ead..b0d0ab5 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -39,7 +39,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:14"
+          "version": "version:16"
         },
         {
           "name": "skia/bots/mips64el_toolchain_linux",
@@ -126,12 +126,12 @@
         {
           "name": "skia/bots/win_toolchain",
           "path": "win_toolchain",
-          "version": "version:9"
+          "version": "version:11"
         },
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:9"
+          "version": "version:14"
         },
         {
           "name": "infra/python/cpython/windows-amd64",