To prep for removing CMake bots, take them off the CQ and presubmit.

GN is now far more capable than our CMake builds.
Time to officially end that experiment.

Reminder how this lands:
  1) this CL
  2) remove the bots from the masters
  3) remove the CMake recipe files
  4) remove the CMake files

I'm willing to wait on 4) until we can do GN -> CMake generation, but I don't want the bots to hold us back.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2350073002

Review-Url: https://codereview.chromium.org/2350073002

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index c281b9a..8115b49 100644 (file)
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -41,8 +41,6 @@ GOLD_TRYBOT_URL = 'https://gold.skia.org/search?issue='
 # Path to CQ bots feature is described in https://bug.skia.org/4364
 PATH_PREFIX_TO_EXTRA_TRYBOTS = {
     # pylint: disable=line-too-long
-    'cmake/': 'master.client.skia.compile:Build-Mac-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot',
-    # pylint: disable=line-too-long
     'src/opts/': 'master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot',
 
     'include/private/SkAtomics.h': ('master.client.skia:'

diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index 870213d..351829b 100644 (file)
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -40,7 +40,6 @@ verifiers {
       builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }
       builders { name: "Build-Ubuntu-Clang-mips64el-Debug-GN_Android-Trybot" }
       builders { name: "Build-Ubuntu-Clang-x86_64-Debug-GN-Trybot" }
-      builders { name: "Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot" }
       builders { name: "Build-Ubuntu-GCC-x86_64-Release-GN-Trybot" }
       builders { name: "Build-Win-MSVC-x86-Debug-Trybot" }
       builders { name: "Build-Win-MSVC-x86_64-Release-Vulkan-Trybot" }