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

[6.5.0] Workspace, repository, and label terms are still confusing, esp. w.r.t. repostiory_name #20553

Closed
bazel-io opened this issue Dec 14, 2023 · 3 comments

Comments

@bazel-io
Copy link
Member

Forked from #16210

@bazel-io bazel-io added this to the 6.5.0 release blockers milestone Dec 14, 2023
@bazel-io
Copy link
Member Author

Cherry-pick was attempted, but there may be merge conflict(s). Please resolve manually.
cc: @bazelbuild/triage

@iancha1992
Copy link
Member

iancha1992 commented Dec 14, 2023

@Wyverald @fmeum @meteorcloudy
Looks like there are some conflicts when I try to cherry-pick 1bcb68c to release-6.5.0.

  1. src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
    We have:

BazelStarlarkContext.from(thread).checkLoadingPhase("native.package_name"); in release-6.5.0 branch, but BazelStarlarkContext.checkLoadingPhase(thread, "native.package_name"); in master branch

BazelStarlarkContext.from(thread).checkLoadingPhase("native.repository_name"); in release-6.5.0 branch, but BazelStarlarkContext.checkLoadingPhase(thread, "native.repository_name"); in master branch

BazelStarlarkContext.from(thread).checkLoadingPhase("native.module_name"); in release-6.5.0 branch, but BazelStarlarkContext.checkLoadingPhase(thread, "native.module_name"); in the master.

BazelStarlarkContext.from(thread).checkLoadingPhase("native.module_version") in release-6.5.0 branch, but BazelStarlarkContext.checkLoadingPhase(thread, "native.module_version"); in the master.

If you want the changes from the release-6.5.0 branch, then I can continue with cherry-pick and create a PR. But if not then, I am unable to cherry-pick this one.

Thank you.

cc: @bazelbuild/triage

@Wyverald
Copy link
Member

cherry-pick in #20590

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants