fix: in workspace discovery consider the exclude list earlier on
#3387
Conversation
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
ParkMyCar
force-pushed
the
rendering/workspace-excludes
branch
from
dd65df4 to
812456f
Compare
ParkMyCar
force-pushed
the
rendering/workspace-excludes
branch
from
812456f to
ca13af4
Compare
5 tasks
UebelAndre
requested changes
Apr 5, 2025
| .transpose()? | ||
| .unwrap_or_default(); | ||
|
|
||
| // TODO: It would be nice if WalkDir could skip entire directories so |
There was a problem hiding this comment.
Couldn't you use filter_entry for this?
There was a problem hiding this comment.
Oh perfect! I was only looking at the API on the WalkDir struct so missed that. Will update the PR!
ParkMyCar
added a commit
to MaterializeInc/materialize
that referenced
this pull request
Apr 5, 2025
This PR upgrades our use of `rules_rust` to `v0.59.3`, which is a custom version I released on our [fork](https://github.com/MaterializeInc/rules_rust/releases/tag/mz-0.59.3). As described on the release, it's a fork of the upstream `v0.59.2` and includes two PRs I made upstream: 1. bazelbuild/rules_rust#3386 2. bazelbuild/rules_rust#3387 In addition to `rules_rust` we upgrade (out of necessity) * `rules_cc` - rules for building C/C++ dependencies * `protobuf` - required by the upgrade of `rules_cc` * `bazel_skylib` - stdlib like Bazel rules Note: This regresses our support for Apple x86_64 because I didn't have a machine I could use to rebuild the `cargo-bazel` binary. But AFAIK everyone using a Macbook now has an ARM based machine so this shouldn't be an issue. ### Motivation Unblocks our upgrade to Rust 1.86.0 and Edition 2024 ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
illicitonion
reviewed
Apr 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In the
Cargo.tomlfile for defining a Cargo Workspace, you can specify anexcludekey which supports glob patterns to ignore entire subtrees.This PR adds some logic to the directory walking loop to consider these patterns very early on. There is already some logic to handle these
excludepaths, but it doesn't handle globs and the existing logic is after we try to read aManifest, which is problematic if part of your file tree has aCargo.tomlthat is invalid or difficult to read, e.g. part of a virtual environment.