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] Fix the documentation for bazel fetch --configure #23666

Closed
bazel-io opened this issue Sep 19, 2024 · 12 comments
Closed

[7.4.0] Fix the documentation for bazel fetch --configure #23666

bazel-io opened this issue Sep 19, 2024 · 12 comments

Comments

@bazel-io
Copy link
Member

Forked from #23665

@bazel-io bazel-io added this to the 7.4.0 release blockers milestone Sep 19, 2024
@bazel-io
Copy link
Member Author

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

site/en/extending/repo.md
third_party/cncf_udpa/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.

site/en/extending/repo.md third_party/cncf_udpa/BUILD

cc: @bazelbuild/triage

@fmeum @Wyverald @meteorcloudy

@fmeum
Copy link
Collaborator

fmeum commented Sep 19, 2024

Something is wrong here, this commit shouldn't have touched third_party

@meteorcloudy
Copy link
Member

@iancha1992 Can you try to manually cherry-pick c04a561?

@iancha1992
Copy link
Member

iancha1992 commented Sep 20, 2024

@iancha1992 Can you try to manually cherry-pick c04a561?

@meteorcloudy @fmeum I am getting the merge conflicts in the same files as well when I cherry-pick that commit

@meteorcloudy
Copy link
Member

We probably need 1ab2c82 as well, /cc @Wyverald

@meteorcloudy
Copy link
Member

@iancha1992 Can you try to cherry pick 1ab2c82 and then c04a561?

@iancha1992
Copy link
Member

iancha1992 commented Sep 24, 2024

@meteorcloudy I am having a same issue because the two files changes from c04a561 are site/en/extending/repo.md and src/main/starlark/builtins_bzl/common/xcode/semantics.bzl.oss. But after cherry-picking the 1ab2c82, and while cherry-picking the c04a561, third_party/cncf_udpa/BUILD, instead of src/main/starlark/builtins_bzl/common/xcode/semantics.bzl.oss is having a merge conflict. Is this okay?

This is the draft PR that has the cherry-picked commit, 1ab2c82 (I did try and cherry-pick c04a561 on top of this on my local and that's where the issue is): #23723

@iancha1992
Copy link
Member

@meteorcloudy
Looks like src/main/starlark/builtins_bzl/common/xcode/semantics.bzl.oss also isn't in the release-7.4.0 branch yet

@meteorcloudy
Copy link
Member

@iancha1992 I see, then let's ignore the change in src/main/starlark/builtins_bzl/common/xcode/semantics.bzl.oss and only make sure site/en/extending/repo.md is up-to-date.

@Wyverald
Copy link
Member

I'll send a PR -- a lot of doc updates were never cherry-picked to the 7.x branches.

@Wyverald
Copy link
Member

#23741

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

5 participants