commit 2267eab29dda6b000252653b849fadac2ee1622b
author Antonio Maiorano <amaiorano@google.com> Thu Feb 22 01:06:23 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 22 01:06:23 2024 +0000
tree cca9119281636d21b9ee6684b751548a88913a2f
parent c4fe82d9f72bb925a3fe44913290b86bcecaf211

infra: Remove named vs_toolchain cache.

This is no longer needed now that Dawn uses the pinned depot_tools.

Bug: dawn:2431
Change-Id: I402ef137baaa9e6fc31ab971076ec36135861734
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/175761
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>

infra/config/global/generated/cr-buildbucket.cfg

diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 269bd1b..776eea4 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -185,10 +185,6 @@
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x64\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -206,10 +202,6 @@
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x86\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -227,10 +219,6 @@
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x64\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -248,10 +236,6 @@
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x86\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -469,10 +453,6 @@
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x64\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -491,10 +471,6 @@
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x86\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -513,10 +489,6 @@
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x64\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
@@ -535,10 +507,6 @@
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x86\""
       }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
       service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {

infra/config/global/main.star

diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 4db0ade..b284cae 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -235,9 +235,7 @@
       A list of caches
     """
     caches = []
-    if os.category == os_category.WINDOWS and clang:
-        caches.append(swarming.cache(name = "win_toolchain", path = "win_toolchain"))
-    elif os.category == os_category.MAC:
+    if os.category == os_category.MAC:
         # Cache for mac_toolchain tool and XCode.app
         caches.append(swarming.cache(name = "osx_sdk", path = "osx_sdk"))
     return caches