Skip to content

Commit

Permalink
Fix googleapis and remoteapis sources in bootstrap distfile
Browse files Browse the repository at this point in the history
Previously, their sources are included as external repos and mapped to third_party,
after this change, their sources are directly included under the third_party directory.

This change is needed because a54a393 broke the mapping mechanism which depends on the canonical repository name.

Fixes //src/test/shell/bazel:bazel_bootstrap_distfile_tar_test with Bazel@HEAD and Bazel@7.1 https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/3657#018da594-e743-44da-8f76-782a8e5c86b1

Related #21292

PiperOrigin-RevId: 606960533
Change-Id: Ia4a81d5730e04964bc06c8f8ee2685364ce8623b
  • Loading branch information
meteorcloudy authored and copybara-github committed Feb 14, 2024
1 parent 60bcd35 commit b079a77
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@ pkg_tar(
remap_paths = {
"MODULE.bazel.lock.dist": "MODULE.bazel.lock",
"WORKSPACE.bzlmod.filtered": "WORKSPACE.bzlmod",
# Rewrite paths coming from local repositories back into third_party.
"external/googleapis~override": "third_party/googleapis",
"external/remoteapis~override": "third_party/remoteapis",
},
strip_prefix = ".",
# Public but bazel-only visibility.
Expand Down
4 changes: 2 additions & 2 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ filegroup(
"//third_party/android_dex:srcs",
"//third_party/cncf_udpa:srcs",
"//third_party/def_parser:srcs",
"//third_party/googleapis:srcs",
"//third_party/grpc:srcs",
"//third_party/grpc-java:srcs",
"//third_party/ijar:srcs",
Expand All @@ -33,9 +34,8 @@ filegroup(
"//third_party/py/frozendict:srcs",
"//third_party/py/mock:srcs",
"//third_party/py/six:srcs",
"//third_party/remoteapis:srcs",
"//third_party/zlib:srcs",
"@googleapis//:srcs",
"@remoteapis//:srcs",
],
)

Expand Down

0 comments on commit b079a77

Please sign in to comment.