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.

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

Ensure lockfile is updated after reset to pre-build state #19343

Closed
wants to merge 2 commits into from

Conversation

fmeum
Copy link
Collaborator

@fmeum fmeum commented Aug 26, 2023

The events that update the lockfile are important for incremental correctness and thus need to return true from storeForReplay.

Before this change, if a build creates the lockfile because it didn't exist and the lockfile is then deleted, subsequent builds did not regenerate it as the relevant SkyFunctions wouldn't rerun and the events were not replayed.

@fmeum fmeum requested review from SalmaSamy and removed request for Wyverald and meteorcloudy August 26, 2023 07:58
@github-actions github-actions bot added awaiting-review PR is awaiting review from an assigned reviewer team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. labels Aug 26, 2023
The events that update the lockfile are important for incremental
correctness and thus need to return `true` from `storeForReplay`.

Before this change, if a build creates the lockfile because it didn't
exist and the lockfile is then deleted, subsequent builds did not
regenerate it as the relevant SkyFunctions wouldn't rerun and the events
were not replayed.
@fmeum
Copy link
Collaborator Author

fmeum commented Aug 26, 2023

The new test may be flaky without #19339.

],
)

_, _, _ = self.RunBazel(['build', '@hello//:all'])
Copy link
Contributor

@SalmaSamy SalmaSamy Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this part: _, _, _ =

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure whether this would trigger a linter. Feel free to remove on import (or let me know that I should drop it here).

@meteorcloudy meteorcloudy added awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally and removed awaiting-review PR is awaiting review from an assigned reviewer labels Aug 28, 2023
@github-actions github-actions bot removed the awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally label Aug 30, 2023
@fmeum fmeum deleted the fix-incremental-updates branch August 30, 2023 11:18
@fmeum
Copy link
Collaborator Author

fmeum commented Aug 30, 2023

@bazel-io flag

@bazel-io bazel-io added the potential release blocker Flagged by community members using "@bazel-io flag". Should be added to a release blocker milestone label Aug 30, 2023
@meteorcloudy
Copy link
Member

@bazel-io fork 6.4.0

@bazel-io bazel-io removed the potential release blocker Flagged by community members using "@bazel-io flag". Should be added to a release blocker milestone label Aug 30, 2023
iancha1992 pushed a commit to iancha1992/bazel that referenced this pull request Aug 30, 2023
The events that update the lockfile are important for incremental correctness and thus need to return `true` from `storeForReplay`.

Before this change, if a build creates the lockfile because it didn't exist and the lockfile is then deleted, subsequent builds did not regenerate it as the relevant SkyFunctions wouldn't rerun and the events were not replayed.

Closes bazelbuild#19343.

PiperOrigin-RevId: 561287438
Change-Id: I549f99b896a0095e8ffc35b7bacc8a841a44219a
iancha1992 pushed a commit to iancha1992/bazel that referenced this pull request Aug 30, 2023
The events that update the lockfile are important for incremental correctness and thus need to return `true` from `storeForReplay`.

Before this change, if a build creates the lockfile because it didn't exist and the lockfile is then deleted, subsequent builds did not regenerate it as the relevant SkyFunctions wouldn't rerun and the events were not replayed.

Closes bazelbuild#19343.

PiperOrigin-RevId: 561287438
Change-Id: I549f99b896a0095e8ffc35b7bacc8a841a44219a
iancha1992 added a commit that referenced this pull request Aug 31, 2023
…9371)

The events that update the lockfile are important for incremental
correctness and thus need to return `true` from `storeForReplay`.

Before this change, if a build creates the lockfile because it didn't
exist and the lockfile is then deleted, subsequent builds did not
regenerate it as the relevant SkyFunctions wouldn't rerun and the events
were not replayed.

Closes #19343.

Commit
19c0c80

PiperOrigin-RevId: 561287438
Change-Id: I549f99b896a0095e8ffc35b7bacc8a841a44219a

Co-authored-by: Salma Samy <salmasamy@google.com>
@iancha1992
Copy link
Member

The changes in this PR have been included in Bazel 6.4.0 RC1. Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk, you can point to the latest RC by setting USE_BAZEL_VERSION=last_rc.
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants