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

Fixes _module_repo_name when building with Bazel@HEAD or Bazel 7.1 #21324

Closed
wants to merge 1 commit into from

Conversation

meteorcloudy
Copy link
Member

@meteorcloudy meteorcloudy commented Feb 13, 2024

If get_canonical_repo_name no longer returns the repo name with version due to containing a54a393, the _module_repo_name should not either.

Fixes: #21292

@github-actions github-actions bot added the awaiting-review PR is awaiting review from an assigned reviewer label Feb 13, 2024
@sgowroji sgowroji added the team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. label Feb 13, 2024
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Feb 13, 2024
meteorcloudy added a commit to meteorcloudy/bazel that referenced this pull request Feb 14, 2024
If `get_canonical_repo_name` no longer returns the repo name with version due to containing bazelbuild@a54a393, the `_module_repo_name` should not either.

Fixes: bazelbuild#21292

Closes bazelbuild#21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f
github-merge-queue bot pushed a commit that referenced this pull request Feb 14, 2024
…21349)

Fixes //src/test/py/bazel:bazel_vendor_test in ipv6-only environment …
…on macOS

https://buildkite.com/bazel/bazel-bazel-macos-ninja/builds/514

PiperOrigin-RevId: 606599015
Change-Id: I36a8534d6676bc5c3c9a0157eea28fb033e9cf3e

-------

Fixes //src/test/shell/bazel:bazel_test_test in ipv6-only environment…
… on macOS

https://buildkite.com/bazel/bazel-bazel-macos-ninja/builds/517

PiperOrigin-RevId: 606603953
Change-Id: Id730a0457e2a6bc1ac5371cbbce25c4acd25ab9d

-----

Fixes _module_repo_name when building with Bazel@HEAD or Bazel 7.1
If `get_canonical_repo_name` no longer returns the repo name with
version due to containing a54a393, the `_module_repo_name` should not
either.

Fixes: #21292

Closes #21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f

-----

Make sure generate_dist_lockfile works in ipv6-only environment
Fixes
https://buildkite.com/bazel/bazel-bazel-macos-ninja/builds/534#018da46c-5aff-45ea-8b66-937e676b09b2

PiperOrigin-RevId: 606951013
Change-Id: I9336c9b8a173ed464b0fd3dab22a5dc1614b4c62

----

Fix googleapis and remoteapis sources in bootstrap distfile
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
fweikert pushed a commit to fweikert/bazel that referenced this pull request Feb 23, 2024
If `get_canonical_repo_name` no longer returns the repo name with version due to containing bazelbuild@a54a393, the `_module_repo_name` should not either.

Fixes: bazelbuild#21292

Closes bazelbuild#21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f
fweikert added a commit that referenced this pull request Feb 23, 2024
…21486)

If `get_canonical_repo_name` no longer returns the repo name with
version due to containing
a54a393,
the `_module_repo_name` should not either.

Fixes: #21292

Closes #21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f

Co-authored-by: Yun Peng <pcloudy@google.com>
fweikert added a commit to fweikert/bazel that referenced this pull request Mar 5, 2024
…azelbuild#21486)

If `get_canonical_repo_name` no longer returns the repo name with
version due to containing
bazelbuild@a54a393,
the `_module_repo_name` should not either.

Fixes: bazelbuild#21292

Closes bazelbuild#21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f

Co-authored-by: Yun Peng <pcloudy@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ERROR: An error occurred during the fetch of repository '_main~bazel_build_deps~bootstrap_repo_cache' in CI
3 participants