Implement ignoring directories based on wildcards.#24032
Closed
Implement ignoring directories based on wildcards.#24032
Conversation
github-actions
bot
added
team-ExternalDeps
This was referenced Oct 18, 2024
Member
|
Thanks! Waiting for @Wyverald to take a look! |
fmeum
reviewed
Oct 18, 2024
src/main/java/com/google/devtools/build/lib/cmdline/IgnoredSubdirectories.java
Outdated
Show resolved
Hide resolved
Wyverald
reviewed
Oct 24, 2024
Wyverald
reviewed
Oct 24, 2024
src/main/java/com/google/devtools/build/lib/packages/RepoCallable.java
Outdated
Show resolved
Hide resolved
Wyverald
reviewed
Oct 24, 2024
Wyverald
reviewed
Oct 25, 2024
Member
Wyverald
left a comment
Wyverald
left a comment
There was a problem hiding this comment.
so I reviewed some more superficial parts of this change before happening on to the whole "splitting RepoFileFunction into two parts" thing. After reading the context in #7093 (comment), my initial gut reaction is that this is a lot of extra complexity that's really not justified by its gains.
Besides Fabian's suggestion to cut edge 8 (which you had a counterargument for), I was also thinking if we could just cut edge 1 -- that is, WORKSPACE is going away anyway, so let's not worry about that. Essentially, we can try to make the assertion that computing the main repo mapping does not transitively depend on IgnoredPackagePrefixesValue.
Unfortunately, that's not true... If we have a non-registry override for a bazel_dep, and the override refers to a patch file (which is addressed by a label), then we'll need to look up the package for that label. (Not to mention we actually need to load @bazel_tools//tools/build_defs/repo:http.bzl anyway, but I was hoping those could be avoided using exceptions -- which we already have quite a few of, regarding stuff in @bazel_tools.)
So all that was a long way to say I haven't finished the review yet, and will get to the meaty parts now.
Wyverald
reviewed
Oct 25, 2024
src/main/java/com/google/devtools/build/lib/skyframe/RepoFileFunction.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
I addressed the review comments and although the presubmits haven't quite passed yet, they look good so far so I'll context switch away from this. PTAL! |
Wyverald
reviewed
Oct 30, 2024
src/main/java/com/google/devtools/build/lib/skyframe/PackageArgsFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/PackageArgsFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/PackageArgsFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/PackageArgsFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/RepoFileFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/PackageArgsFunction.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesFunction.java
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/cmdline/IgnoredSubdirectories.java
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/packages/RepoFileGlobals.java
Outdated
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Comments addressed and tests are green. PTAL! |
Wyverald
reviewed
Oct 31, 2024
Wyverald
reviewed
Oct 31, 2024
src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Done and done. PTYAL! |
Wyverald
approved these changes
Oct 31, 2024
Member
Wyverald
left a comment
Wyverald
left a comment
There was a problem hiding this comment.
few more nits, but overall LGTM! Please import this yourself, as I'd imagine there are a few Blaze-specific changes to be made. Or if you'd rather I do the import, just let me know!
| private RepoFileValue evalRepoFile( | ||
| StarlarkFile starlarkFile, | ||
| RepositoryName repoName, | ||
| RepositoryMapping repoMapping, |
Member
There was a problem hiding this comment.
ping -- this arg should be removed
src/main/java/com/google/devtools/build/lib/skyframe/RepoFileFunction.java
Show resolved
Hide resolved
src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesFunction.java
Show resolved
Hide resolved
This is accomplished by a new directive in REPO.bazel, "ignore_directories()". It takes a single argument, a list of directories to ignore and it allows the same wildcards as glob(). This is done separately from .bazelignore to provide a migration path off of that weird single-purpose configuration file. Implementing this requires splitting RepoFileFunction into two: a part that parses the repository file and one that creates a PackageArgs instance. This was necessary to avoid a Skyframe dependency cycle: when a WORKSPACE file is present and it loads a .bzl file from a repository with a REPO.bazel file, the repo mapping for the main repository depends on the WORKSPACE file, which depends on the .bzl file, which depends on the IgnoredPackagePrefixesValue of its repository, which then depends on the repo mapping of the main repository and the one the .bzl file is in, which then depend on the WORKSPACE file. Fixes #7093. RELNOTES[NEW]: REPO.bazel now allows another directive, "ignore_directories()". It takes a list of directories to ignore just like .bazelignore does, but with glob semantics.
lberki
force-pushed
the
lberki-ignore-wildcard-good
branch
from
aff0fba to
f7fa158
Compare
github-actions
bot
removed
the
awaiting-review
lberki
added a commit
that referenced
this pull request
Nov 5, 2024
This is accomplished by a new directive in REPO.bazel, "ignore_directories()". It takes a single argument, a list of directories to ignore and it allows the same wildcards as glob(). This is done separately from .bazelignore to provide a migration path off of that weird single-purpose configuration file. Implementing this requires splitting RepoFileFunction into two: a part that parses the repository file and one that creates a PackageArgs instance. This was necessary to avoid a Skyframe dependency cycle: when a WORKSPACE file is present and it loads a .bzl file from a repository with a REPO.bazel file, the repo mapping for the main repository depends on the WORKSPACE file, which depends on the .bzl file, which depends on the IgnoredPackagePrefixesValue of its repository, which then depends on the repo mapping of the main repository and the one the .bzl file is in, which then depend on the WORKSPACE file. Fixes #7093. RELNOTES[NEW]: REPO.bazel now allows another directive, "ignore_directories()". It takes a list of directories to ignore just like .bazelignore does, but with glob semantics. Closes #24032. PiperOrigin-RevId: 693227896 Change-Id: Ia3e02a2bfe9caf999fc641f75261b528b19c1d03
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 5, 2024
This is accomplished by a new directive in REPO.bazel, "ignore_directories()". It takes a single argument, a list of directories to ignore and it allows the same wildcards as glob(). This is done separately from .bazelignore to provide a migration path off of that weird single-purpose configuration file. Implementing this requires splitting RepoFileFunction into two: a part that parses the repository file and one that creates a PackageArgs instance. This was necessary to avoid a Skyframe dependency cycle: when a WORKSPACE file is present and it loads a .bzl file from a repository with a REPO.bazel file, the repo mapping for the main repository depends on the WORKSPACE file, which depends on the .bzl file, which depends on the IgnoredPackagePrefixesValue of its repository, which then depends on the repo mapping of the main repository and the one the .bzl file is in, which then depend on the WORKSPACE file. Fixes #7093. RELNOTES[NEW]: REPO.bazel now allows another directive, "ignore_directories()". It takes a list of directories to ignore just like .bazelignore does, but with glob semantics. Closes #24032. PiperOrigin-RevId: 693227896 Change-Id: Ia3e02a2bfe9caf999fc641f75261b528b19c1d03
ramil-bitrise
pushed a commit
to bitrise-io/bazel
that referenced
this pull request
Dec 18, 2024
This is accomplished by a new directive in REPO.bazel, "ignore_directories()". It takes a single argument, a list of directories to ignore and it allows the same wildcards as glob(). This is done separately from .bazelignore to provide a migration path off of that weird single-purpose configuration file. Implementing this requires splitting RepoFileFunction into two: a part that parses the repository file and one that creates a PackageArgs instance. This was necessary to avoid a Skyframe dependency cycle: when a WORKSPACE file is present and it loads a .bzl file from a repository with a REPO.bazel file, the repo mapping for the main repository depends on the WORKSPACE file, which depends on the .bzl file, which depends on the IgnoredPackagePrefixesValue of its repository, which then depends on the repo mapping of the main repository and the one the .bzl file is in, which then depend on the WORKSPACE file. Fixes bazelbuild#7093. RELNOTES[NEW]: REPO.bazel now allows another directive, "ignore_directories()". It takes a list of directories to ignore just like .bazelignore does, but with glob semantics. Closes bazelbuild#24032. PiperOrigin-RevId: 693227896 Change-Id: Ia3e02a2bfe9caf999fc641f75261b528b19c1d03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is accomplished by a new directive in REPO.bazel, "ignore_directories()". It takes a single argument, a list of directories to ignore and it allows the same wildcards as glob().
This is done separately from .bazelignore to provide a migration path off of that weird single-purpose configuration file.
Implementing this requires splitting RepoFileFunction into two: a part that parses the repository file and one that creates a PackageArgs instance. This was necessary to avoid a Skyframe dependency cycle: when a WORKSPACE file is present and it loads a .bzl file from a repository with a REPO.bazel file, the repo mapping for the main repository depends on the WORKSPACE file, which depends on the .bzl file, which depends on the IgnoredPackagePrefixesValue of its repository, which then depends on the repo mapping of the main repository and the one the .bzl file is in, which then depend on the WORKSPACE file.
Fixes #7093.
RELNOTES[NEW]: REPO.bazel now allows another directive, "ignore_directories()". It takes a list of directories to ignore just like .bazelignore does, but with glob semantics.