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

[7.4.0] Apply single_version_override patches to module files #23757

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

fmeum
Copy link
Collaborator

@fmeum fmeum commented Sep 25, 2024

Work towards #19301

RELNOTES: Patches to the module file in single_version_override are now effective as long as the patch file lies in the root module.

Closes #23536.

PiperOrigin-RevId: 678347809
Change-Id: I6a3c4664e55cff90c8e42795f95d8ef211348ca9

Closes #23605

@fmeum fmeum requested a review from a team as a code owner September 25, 2024 11:21
@fmeum fmeum changed the title Apply single_version_override patches to module files [7.4.0] Apply single_version_override patches to module files Sep 25, 2024
@fmeum fmeum requested review from Wyverald and removed request for a team September 25, 2024 11:22
@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 Sep 25, 2024
Work towards bazelbuild#19301

RELNOTES: Patches to the module file in `single_version_override` are now effective as long as the patch file lies in the root module.

Closes bazelbuild#23536.

PiperOrigin-RevId: 678347809
Change-Id: I6a3c4664e55cff90c8e42795f95d8ef211348ca9
@Wyverald Wyverald added this pull request to the merge queue Sep 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 25, 2024
@Wyverald Wyverald added this pull request to the merge queue Sep 25, 2024
Merged via the queue into bazelbuild:release-7.4.0 with commit 33a2025 Sep 25, 2024
50 checks passed
@fmeum fmeum deleted the 23605-cherry branch September 25, 2024 17:48
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Sep 25, 2024
@honnix
Copy link
Contributor

honnix commented Oct 23, 2024

Thank you for adding this feature.

A question, how does it work when there are multiple versions of the same module? As I understood, patching happens before resolution, so it is unclear to users which version it is patching against, and the patch file the user has prepared may not be valid.

I have a concrete case where multiple versions grpc-java get pulled in. I want to patch against 1.66.0, but after debugging the patching process I realized the patch was against another version, and that of course failed. Is this an unsupported use case?

@fmeum
Copy link
Collaborator Author

fmeum commented Oct 23, 2024

@honnix If you want to patch a specific version, then you (probably) also want to have that version selected. You can achieve that by setting version on single_version_override (and then don't need to set it on bazel_dep).

@honnix
Copy link
Contributor

honnix commented Oct 23, 2024

@honnix If you want to patch a specific version, then you (probably) also want to have that version selected. You can achieve that by setting version on single_version_override (and then don't need to set it on bazel_dep).

Ah, of course 🤦 . Thank you for the help!

Copy link

@Karinza38 Karinza38 left a comment

Choose a reason for hiding this comment

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

fmeum:23605-cherry

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.

4 participants