Re-patch crate dependency if patch file changes#3994
Open
erenon wants to merge 2 commits intobazelbuild:mainfrom
Open
Re-patch crate dependency if patch file changes#3994erenon wants to merge 2 commits intobazelbuild:mainfrom
erenon wants to merge 2 commits intobazelbuild:mainfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Expected behavior
Given a crate annotation:
When "custom.patch" changes, the next build should re-apply the patch to the dependency.
Actual behavior
The build cache is not invalidated if "custom.patch" changes in any ways. Especially problematic with RBE.
Workaround
Rename custom.patch to custom2.patch
This change
The first commit tells bazel about the used patch files, so they appear in the MODULE.bazel.lock file. This way, when the patch file changes, a splice is triggered.
The second commit computes the hash of the contents of the patch files, and specifies that hash as the "canonical_id" of the generated http_archive
I'm not sure if this is the correct way to fix this, but at least it works.
Also, in
crate_universe/extensions.bzl,repo['patches']is always None, so I'm parsing it from the annotations. I'm not sure if this is the best way either. Maybe some other parts fails to set repo.patches, can't tell.Tested with Bazel Build label: 9.1.0