Use CIPD for CMake on Windows
CIPD now provides windows-arm64 binaries for CMake, so we can use that
instead of downloading from Google storage.
This gets us a newer version of CMake, which is needed for the latest
version of SPIRV-Tools.
Bug: 388504160
Change-Id: I1ecb7dceee0bbfd3aa9042cb88c09bd5516f550a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/221435
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/DEPS b/DEPS
index 191ec7e..8475faf 100644
--- a/DEPS
+++ b/DEPS
@@ -395,7 +395,7 @@
},
'tools/cmake': {
- 'condition': '(fetch_cmake or dawn_node) and (host_os == "mac" or host_os == "linux")',
+ 'condition': '(fetch_cmake or dawn_node)',
'packages': [{
'package': 'infra/3pp/tools/cmake/${{platform}}',
'version': Var('dawn_cmake_version'),
@@ -584,31 +584,6 @@
'action': ['python3', 'build/util/lastchange.py',
'-o', 'build/util/LASTCHANGE'],
},
- # TODO(https://crbug.com/1180257): Use CIPD for CMake on Windows.
- {
- 'name': 'cmake_win32',
- 'pattern': '.',
- 'condition': '(fetch_cmake or dawn_node) and host_os == "win"',
- 'action': [ 'python3',
- 'third_party/depot_tools/download_from_google_storage.py',
- '--no_resume',
- '--platform=win32',
- '--no_auth',
- '--bucket', 'chromium-tools',
- Var('dawn_cmake_win32_sha1'),
- '-o', 'tools/cmake-win32.zip'
- ],
- },
- {
- 'name': 'cmake_win32_extract',
- 'pattern': '.',
- 'condition': '(fetch_cmake or dawn_node) and host_os == "win"',
- 'action': [ 'python3',
- 'scripts/extract.py',
- 'tools/cmake-win32.zip',
- 'tools/cmake-win32/',
- ],
- },
# Node binaries, when dawn_node is enabled
{