commit f88b7c83979d128fa83eb5f9102be56cc4bec33c
author David Benjamin <davidben@google.com> Mon Feb 27 15:28:30 2023 -0500
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 28 00:07:05 2023 +0000
tree 1e73b3358e232cf84bebff26c9efdd4c5008e32c
parent e3a5face899e16183f1d207d7327baac57454935

Use the common location for CMake in the bots

Follow-up to
https://chromium-review.googlesource.com/c/chromium/tools/build/+/4296194/

But mostly I've since added a lot more configurations to CI and want to
make sure I haven't broken anything.

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

.gitignore

diff --git a/.gitignore b/.gitignore
index a65880d..68dca6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,7 @@
 
 util/bot/android_ndk
 util/bot/android_sdk/public
-util/bot/cmake-linux64
-util/bot/cmake-mac
-util/bot/cmake-win32
+util/bot/cmake
 util/bot/golang
 util/bot/libFuzzer
 util/bot/libcxx

util/bot/DEPS

diff --git a/util/bot/DEPS b/util/bot/DEPS
index 6846d37..46d86e3 100644
--- a/util/bot/DEPS
+++ b/util/bot/DEPS
@@ -56,34 +56,11 @@
     'dep_type': '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.
-  'boringssl/util/bot/cmake-linux64': {
+  'boringssl/util/bot/cmake': {
     'packages': [{
       'package': 'infra/3pp/tools/cmake/${{platform}}',
       'version': Var('cmake_version'),
     }],
-    'condition': 'host_os == "linux"',
-    'dep_type': 'cipd',
-  },
-
-  'boringssl/util/bot/cmake-mac': {
-    'packages': [{
-      'package': 'infra/3pp/tools/cmake/${{platform}}',
-      'version': Var('cmake_version'),
-    }],
-    'condition': 'host_os == "mac"',
-    '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',
   },