Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.4.0] Fix unconditional Skyframe invalidation with --lockfile_mode=update #19848

Merged
merged 1 commit into from
Oct 17, 2023
Merged

[6.4.0] Fix unconditional Skyframe invalidation with --lockfile_mode=update #19848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,13 @@ public void afterCommand() throws AbruptExitException {
combineModuleExtensions(lockfile.getModuleExtensions(), oldExtensionUsages))
.build();

// Write the new value to the file
updateLockfile(lockfilePath, lockfile);
// Write the new value to the file, but only if needed. This is not just a performance
// optimization: whenever the lockfile is updated, most Skyframe nodes will be marked as dirty
// on the next build, which breaks commands such as `bazel config` that rely on
// com.google.devtools.build.skyframe.MemoizingEvaluator#getDoneValues.
if (!lockfile.equals(oldLockfile)) {
updateLockfile(lockfilePath, lockfile);
}
this.moduleResolutionEvent = null;
this.extensionResolutionEventsMap.clear();
}
Expand Down