Attempt to fix Skyfocus

bazelbuild · Dec 19, 2024 · b713852 · b713852
1 parent 02e2e2c
commit b713852
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/LabelConstants.java b/src/main/java/com/google/devtools/build/lib/cmdline/LabelConstants.java
@@ -48,8 +48,6 @@ public class LabelConstants {
   public static final PathFragment VENDOR_FILE_NAME = PathFragment.create("VENDOR.bazel");
 
   public static final PathFragment MODULE_LOCKFILE_NAME = PathFragment.create("MODULE.bazel.lock");
-  public static final PathFragment MODULE_REPRODUCIBLE_LOCKFILE_NAME =
-      PathFragment.create("MODULE.bazel.reproducible_lock");
 
   // With this prefix, non-main repositories are symlinked under
   // $output_base/execution_root/__main__/external

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyfocusExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyfocusExecutor.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.cache.ActionCache;
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.cmdline.LabelConstants;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.PathFragmentPrefixTrie;
@@ -181,12 +182,17 @@ public static Optional<SkyfocusState> prepareWorkingSet(
 
       ImmutableSet<RootedPath> workingSetRootedPaths =
           Stream.concat(
-                  skyfocusState.options().workingSet.stream(),
-                  // The Bzlmod lockfile can be created after a build without having existed
-                  // before
-                  // and must always be kept in the working set if it is used.
-                  Stream.of("MODULE.bazel.lock"))
-              .map(k -> toFileStateKey(pkgLocator, k))
+                  Stream.concat(
+                          skyfocusState.options().workingSet.stream(),
+                          // The Bzlmod lockfile can be created after a build without having existed
+                          // before
+                          // and must always be kept in the working set if it is used.
+                          Stream.of(LabelConstants.MODULE_LOCKFILE_NAME.toString()))
+                      .map(k -> toFileStateKey(pkgLocator, k)),
+                  Stream.of(
+                      RootedPath.toRootedPath(
+                          Root.fromPath(pkgLocator.getOutputBase()),
+                          LabelConstants.MODULE_LOCKFILE_NAME)))
               .collect(toImmutableSet());
       evaluator
           .getInMemoryGraph()