commit 779d01dcdd0e0c933a890d6e7787ba81ae31f625
author David Benjamin <davidben@google.com> Thu Mar 21 12:05:07 2024 +1000
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 29 17:05:36 2024 +0000
tree 2d64aa3f5f0f3345f2fa707800f1a924598e0533
parent 43cec435d3fea3734b649aa45275f8ab92a67b2b

Install the Windows toolchain under util/bot

Combined with https://crrev.com/c/5346536, this should, I believe, avoid
needing to re-download the toolchains over and over on every CI run once
the caches all fill.

Change-Id: I4991cf61dd164d7d39da91184ba7051ac59ce3f1
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/67347
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>

.gitignore

diff --git a/.gitignore b/.gitignore
index d1cc3b8..439b6aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /util/bot/sde-linux64.tar.xz
 /util/bot/sde-win32
 /util/bot/sde-win32.tar.xz
+/util/bot/win_toolchain
 /util/bot/win_toolchain.json
 
 # Ignore target under any directory.

util/bot/vs_toolchain.py

diff --git a/util/bot/vs_toolchain.py b/util/bot/vs_toolchain.py
index d287ee2..c6dc4a4 100644
--- a/util/bot/vs_toolchain.py
+++ b/util/bot/vs_toolchain.py
@@ -12,6 +12,7 @@
 
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
+toolchain_dir = os.path.join(script_dir, 'win_toolchain')
 json_data_file = os.path.join(script_dir, 'win_toolchain.json')
 
 
@@ -91,6 +92,7 @@
                   'win_toolchain',
                   'get_toolchain_if_necessary.py'),
       '--output-json', json_data_file,
+      '--toolchain-dir', toolchain_dir,
     ] + _GetDesiredVsToolchainHashes(version)
   subprocess.check_call(get_toolchain_args)
   return 0