commit 1e34ddcc95a612b987f482dde25d80d91646bed8
author Zach Anderson <zra@google.com> Wed May 01 21:10:53 2024 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 01 21:10:53 2024 +0000
tree 6f5efd2d22391e6c0675b0bf3188e0230c2b926f
parent 28a1d692751fc7b647c48dacfb9bb2c219ff7f08

Force CAS cache mount

For https://github.com/flutter/flutter/issues/147651.

This should be reverted after the bots are back in a good state.

Change-Id: I177a64890a9bc68b1d5c27214c182ededab2c6f2
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/57400
Commit-Queue: Zach Anderson <zra@google.com>
Reviewed-by: Jason Simmons <jsimmons@google.com>
Reviewed-by: Christopher Fujino <fujino@google.com>

recipe_modules/repo_util/api.py

diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 8efca11..7f3e140 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -93,8 +93,7 @@
     mount_builder = self.m.cache.should_force_mount(
         self.m.path['cache'].join('builder')
     )
-    if (not clobber) and (mount_git or
-                          mount_builder) and (bucket != OFFICIAL_BUILD_BUCKET):
+    if (not clobber) and (bucket != OFFICIAL_BUILD_BUCKET):
       self.m.cache.mount_cache('builder', force=True)
       self._setup_win_toolchain(env)
     # Grab any gclient custom variables passed as properties.

recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json

diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json b/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
index bc0ed9d..89b2bdf 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
@@ -1156,7 +1156,7 @@
       "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
       "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/examples/full.py\", line 49, in RunSteps",
       "    api.repo_util.monorepo_checkout(checkout_path, {}, {})",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 214, in monorepo_checkout",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 213, in monorepo_checkout",
       "    raise ValueError(",
       "ValueError: Input reference is not on dart.googlesource.com/monorepo"
     ]

recipe_modules/repo_util/examples/unsupported.expected/unsupported.json

diff --git a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
index de5412c..bec195a 100644
--- a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
+++ b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
@@ -21,7 +21,7 @@
       "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
       "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/examples/unsupported.py\", line 13, in RunSteps",
       "    api.repo_util.checkout('unsupported_repo', repo_dir)",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 292, in checkout",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 291, in checkout",
       "    raise ValueError('Unsupported repo: %s' % name)",
       "ValueError: Unsupported repo: unsupported_repo"
     ]