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

Jump to bottom

[7.4.0] Apply single_version_override patches to module files #23605

Closed
bazel-io opened this issue Sep 11, 2024 · 3 comments
Closed

[7.4.0] Apply single_version_override patches to module files #23605

bazel-io opened this issue Sep 11, 2024 · 3 comments
Milestone
7.4.0 release blo...

Comments

@bazel-io
Copy link
Member

Forked from #23536
@bazel-io bazel-io added this to the 7.4.0 release blockers milestone Sep 11, 2024
@bazel-io
Copy link
Member Author

Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD
src/main/java/com/google/devtools/build/lib/bazel/repository/PatchUtil.java
src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
third_party/upb/BUILD

cc: @bazelbuild/triage

@iancha1992
Copy link
Member

Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD src/main/java/com/google/devtools/build/lib/bazel/repository/PatchUtil.java src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java third_party/upb/BUILD

cc: @bazelbuild/triage

cc: @fmeum @Wyverald @meteorcloudy

@fmeum fmeum mentioned this issue Sep 25, 2024
Merged
github-merge-queue bot pushed a commit that referenced this issue Sep 25, 2024
@fmeum
[7.4.0] Apply single_version_override patches to module files (#23757)
33a2025 
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
@iancha1992
Copy link
Member

Cherry-picked in #23757

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.4.0 release blockers
Development

No branches or pull requests
3 participants
@Wyverald @bazel-io @iancha1992