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

Allow @repo_name labels in override attributes #21188

Closed
wants to merge 1 commit into from

Conversation

fmeum
Copy link
Collaborator

@fmeum fmeum commented Feb 2, 2024

This is made possible by a refactoring that moves the label parsing of RepoSpec attributes coming from module overrides as well as .bzl file labels containing repo rules from BzlmodRepoRuleFunction into ModuleFileGlobals. Also adds a TODO to BzlmodRepoRuleFunction to further simplify the logic after the next lockfile version bumps, as old lockfiles are now the only source of non-canonical labels in RepoSpecs.

Work towards #19301

@fmeum fmeum force-pushed the apparent-name-patches branch from ed32dfb to 23d844d Compare February 3, 2024 09:32
@fmeum fmeum changed the title Allow repo_name in override label strings Allow @repo_name labels in override attributes Feb 3, 2024
@fmeum fmeum force-pushed the apparent-name-patches branch from 0f43b5f to a85852c Compare February 3, 2024 19:49
@fmeum fmeum marked this pull request as ready for review February 3, 2024 20:58
@github-actions github-actions bot added team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. awaiting-review PR is awaiting review from an assigned reviewer labels Feb 3, 2024
@fmeum fmeum force-pushed the apparent-name-patches branch from a85852c to c34db13 Compare February 7, 2024 21:30
@fmeum
Copy link
Collaborator Author

fmeum commented Feb 7, 2024

@Wyverald I resolved the conflict

@fmeum fmeum requested a review from Wyverald February 7, 2024 21:31
@fmeum
Copy link
Collaborator Author

fmeum commented Feb 7, 2024

@bazel-io fork 7.1.0

@Wyverald Wyverald added awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally and removed awaiting-review PR is awaiting review from an assigned reviewer labels Feb 7, 2024
@fmeum fmeum force-pushed the apparent-name-patches branch from c34db13 to 731d527 Compare February 8, 2024 21:31
@fmeum
Copy link
Collaborator Author

fmeum commented Feb 8, 2024

I resolved the conflict.

@copybara-service copybara-service bot closed this in f0ab82d Feb 9, 2024
@github-actions github-actions bot removed the awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally label Feb 9, 2024
@fmeum fmeum deleted the apparent-name-patches branch February 9, 2024 08:52
iancha1992 pushed a commit to iancha1992/bazel that referenced this pull request Feb 12, 2024
This is made possible by a refactoring that moves the label parsing of `RepoSpec` attributes coming from module overrides as well as `.bzl` file labels containing repo rules from `BzlmodRepoRuleFunction` into `ModuleFileGlobals`. Also adds a TODO to `BzlmodRepoRuleFunction` to further simplify the logic after the next lockfile version bumps, as old lockfiles are now the only source of non-canonical labels in `RepoSpec`s.

Work towards bazelbuild#19301

Closes bazelbuild#21188.

PiperOrigin-RevId: 605517195
Change-Id: Id34c81fa9474fef2354ff1fbc898e518a9044640
Wyverald pushed a commit that referenced this pull request Feb 12, 2024
This is made possible by a refactoring that moves the label parsing of `RepoSpec` attributes coming from module overrides as well as `.bzl` file labels containing repo rules from `BzlmodRepoRuleFunction` into `ModuleFileGlobals`. Also adds a TODO to `BzlmodRepoRuleFunction` to further simplify the logic after the next lockfile version bumps, as old lockfiles are now the only source of non-canonical labels in `RepoSpec`s.

Work towards #19301

Closes #21188.

PiperOrigin-RevId: 605517195
Change-Id: Id34c81fa9474fef2354ff1fbc898e518a9044640
github-merge-queue bot pushed a commit that referenced this pull request Feb 12, 2024
This is made possible by a refactoring that moves the label parsing of
`RepoSpec` attributes coming from module overrides as well as `.bzl`
file labels containing repo rules from `BzlmodRepoRuleFunction` into
`ModuleFileGlobals`. Also adds a TODO to `BzlmodRepoRuleFunction` to
further simplify the logic after the next lockfile version bumps, as old
lockfiles are now the only source of non-canonical labels in
`RepoSpec`s.

Work towards #19301

Closes #21188.

PiperOrigin-RevId: 605517195
Change-Id: Id34c81fa9474fef2354ff1fbc898e518a9044640

Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
@iancha1992
Copy link
Member

The changes in this PR have been included in Bazel 7.1.0 RC1. Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk, you can point to the latest RC by setting USE_BAZEL_VERSION=last_rc.
Thanks!

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.

3 participants