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

[6.2.0] Allow WORKSPACE and WORKSPACE-loaded .bzl files to see Bzlmod root module's mappings #17818

Merged
merged 2 commits into from
Mar 20, 2023
Merged

[6.2.0] Allow WORKSPACE and WORKSPACE-loaded .bzl files to see Bzlmod root module's mappings #17818

merged 2 commits into from
Mar 20, 2023

Commits on Mar 17, 2023

  1. Allow WORKSPACE and WORKSPACE-loaded .bzl files to see Bzlmod root mo… 

    …dule's mappings

Currently, we evaluate WORKSPACE (`WorkspaceFileFunction`) and WORKSPACE-loaded .bzl files (`BzlLoadFunction` with `BzlLoadValue.KeyForWorkspace`) with the repo mapping purely computed from previous WORKSPACE chunks. This is unlike BUILD-loaded .bzl files from WORKSPACE-defined repos (`BzlLoadFunction` with `BzlLoadValue.KeyForBuild`, which is the same as `RepositoryMappingFunction`), which take the mappings of the Bzlmod root module into account. This CL fixes that discrepancy by doing the same "repo mapping composition" everywhere.

Fixes #17655

RELNOTES: Fixed an issue where WORKSPACE and WORKSPACE-loaded .bzl files couldn't see the Bzlmod root module's mappings when Bzlmod is enabled.
PiperOrigin-RevId: 515318590
Change-Id: I4babc922f6cdb932d17ce18d9a9d9d427dbed2eb
    @Wyverald @keertk
    Wyverald authored and keertk committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    a7266f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge branch 'release-6.2.0' into cherry-pick-17655

    @ShreeM01
    ShreeM01 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    97ab048 View commit details
    Browse the repository at this point in the history