Switch to the CIPD version of CMake on Windows.
Bug: chromium:1205638
Change-Id: Iee6d4cbdff513f248e747fc497c4bda3efb995e5
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/52645
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/.gitignore b/.gitignore
index 1a27c89..ab8580c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@
util/bot/cmake-linux64
util/bot/cmake-mac
util/bot/cmake-win32
-util/bot/cmake-win32.zip
util/bot/golang
util/bot/libFuzzer
util/bot/libcxx
diff --git a/util/bot/DEPS b/util/bot/DEPS
index b9d42ef..690a4a8 100644
--- a/util/bot/DEPS
+++ b/util/bot/DEPS
@@ -25,7 +25,7 @@
# cipd describe PACKAGE_NAME -version latest
# infra/3pp/tools/cmake/linux-amd64
- 'cmake_version': 'version:2@3.21.3',
+ 'cmake_version': 'version:2@3.23.1',
# infra/3pp/tools/go/linux-amd64
'go_version': 'version:2@1.17.2',
@@ -53,7 +53,7 @@
'dep_type': 'cipd',
},
- # TODO(davidben): Merge cmake-linux64 and cmake-mac. Now that we use CIPD,
+ # TODO(davidben): Merge the three CMake directories. Now that we use CIPD,
# which supports a ${{platform}} marker, there is nothing platform-specific
# about this anymore. However, the recipe still expects CMake to be found at
# these directories, so this needs to be coordinated with a change there.
@@ -75,6 +75,15 @@
'dep_type': 'cipd',
},
+ 'boringssl/util/bot/cmake-win32': {
+ 'packages': [{
+ 'package': 'infra/3pp/tools/cmake/${{platform}}',
+ 'version': Var('cmake_version'),
+ }],
+ 'condition': 'host_os == "win"',
+ 'dep_type': 'cipd',
+ },
+
'boringssl/util/bot/golang': {
'packages': [{
'package': 'infra/3pp/tools/go/${{platform}}',
@@ -106,28 +115,6 @@
hooks = [
# TODO(https://crbug.com/1180257): Use CIPD for CMake on Windows.
{
- 'name': 'cmake_win32',
- 'pattern': '.',
- 'condition': 'host_os == "win"',
- 'action': [ 'download_from_google_storage',
- '--no_resume',
- '--platform=win32',
- '--no_auth',
- '--bucket', 'chromium-tools',
- '-s', 'boringssl/util/bot/cmake-win32.zip.sha1',
- ],
- },
- {
- 'name': 'cmake_win32_extract',
- 'pattern': '.',
- 'condition': 'host_os == "win"',
- 'action': [ 'python3',
- 'boringssl/util/bot/extract.py',
- 'boringssl/util/bot/cmake-win32.zip',
- 'boringssl/util/bot/cmake-win32/',
- ],
- },
- {
'name': 'perl_win32',
'pattern': '.',
'condition': 'host_os == "win"',
diff --git a/util/bot/UPDATING b/util/bot/UPDATING
index dad6192..cff2608 100644
--- a/util/bot/UPDATING
+++ b/util/bot/UPDATING
@@ -24,12 +24,6 @@
upload_to_google_storage.py -b chromium-tools FILE
-cmake-win32.zip: Update to the latest prebuilt release of CMake, found at
- https://cmake.org/download/. Use the file labeled "Windows win64-x64
- ZIP". The download will be named cmake-VERSION-win64-x64.zip.
-
- The current revision is cmake-3.19.5-win64-x64.zip
-
nasm-win32.exe: Update to the appropriate release of NASM, found at
https://www.nasm.us/. Use the same version as Chromium, found at
https://chromium.googlesource.com/chromium/src/+/master/third_party/nasm/README.chromium
diff --git a/util/bot/cmake-win32.zip.sha1 b/util/bot/cmake-win32.zip.sha1
deleted file mode 100644
index d641c17..0000000
--- a/util/bot/cmake-win32.zip.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b106d66bcdc8a71ea2cdf5446091327bfdb1bcd7
\ No newline at end of file
