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.1.0] Cherry-pick recent changes to fix CI flakiness and breakages #21349

Merged
merged 7 commits into from
Feb 14, 2024
Merged

[7.1.0] Cherry-pick recent changes to fix CI flakiness and breakages #21349

merged 7 commits into from
Feb 14, 2024

Commits on Feb 14, 2024

  1. 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
    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    55fedee View commit details
    Browse the repository at this point in the history

  2. 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
    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    fb7d0cc View commit details
    Browse the repository at this point in the history

  3. 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 bazelbuild@a54a393, the `_module_repo_name` should not either.

Fixes: bazelbuild#21292

Closes bazelbuild#21324.

PiperOrigin-RevId: 606646238
Change-Id: I8835a84842c2c66929586b39156eb9f5a541652f
    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    c64c40f View commit details
    Browse the repository at this point in the history

  4. 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
    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    661023b View commit details
    Browse the repository at this point in the history

  5. 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 bazelbuild@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 bazelbuild#21292

PiperOrigin-RevId: 606960533
Change-Id: Ia4a81d5730e04964bc06c8f8ee2685364ce8623b
    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0cf061a View commit details
    Browse the repository at this point in the history

  6. Update lockfile

    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    1fb4f67 View commit details
    Browse the repository at this point in the history

  7. Update lockfile

    @meteorcloudy
    meteorcloudy committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    4e64c5b View commit details
    Browse the repository at this point in the history