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] Add override_repo and inject_repo #23724

Closed
bazel-io opened this issue Sep 24, 2024 · 4 comments
Closed

[7.4.0] Add override_repo and inject_repo #23724

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

Comments

@bazel-io
Copy link
Member

Forked from #23534
@bazel-io bazel-io added this to the 7.4.0 release blockers milestone Sep 24, 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/BazelDepGraphFunction.java
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphValue.java
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvalStarlarkThreadContext.java
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java
src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
src/test/tools/bzlmod/MODULE.bazel.lock

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/BazelDepGraphFunction.java src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphValue.java src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvalStarlarkThreadContext.java src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java src/test/tools/bzlmod/MODULE.bazel.lock

cc: @bazelbuild/triage

cc: @fmeum @wylazy @meteorcloudy

@iancha1992 iancha1992 reopened this Sep 24, 2024
@fmeum
Copy link
Collaborator

fmeum commented Sep 25, 2024 •
edited
Loading

@Wyverald Part of the conflict is due to e9aada5 missing from the release branch, could you cherry-pick it? If that's too much effort, I can probably cherry-pick this change without it, but that may make cherry-picking it even more difficult in the future.

@fmeum fmeum mentioned this issue Oct 10, 2024
Merged
@iancha1992
Copy link
Member

Cherry-picked in #23938

github-merge-queue bot pushed a commit that referenced this issue Oct 10, 2024
@fmeum @Wyverald
[7.4.0] Add override_repo and inject_repo (#23938)
067ce4d 
Work towards #19301
Fixes #23580

RELNOTES: `override_repo` and `inject_repo` can be used to override and
inject repos in module extensions.

Closes #23534.

PiperOrigin-RevId: 678139661
Change-Id: Iea7caca949c00e701f056c1037e273fee9740e93

(cherry picked from commit
46341b1)

Fixes #23724
Fixes #23799

Also includes:
* Disallow importing injected repos
(8472c9d)

---------

Co-authored-by: Xùdōng Yáng <[email protected]>
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
4 participants
@Wyverald @fmeum @bazel-io @iancha1992