Workspace directory #2495
Merged
Workspace directory #2495
Conversation
This file contains 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
oliversun9
commented
Oct 13, 2023
| @@ -302,48 +304,6 @@ func TestWorkspaceNestedArchive(t *testing.T) { | |||
| ) | |||
| } | |||
|
|
|||
| func TestWorkspaceGit(t *testing.T) { | |||
There was a problem hiding this comment.
This is re-enabled, but moved to workspace_unix_test.go because there seems to be a problem with git clone on the Windows CI, see workflow run. This might fix it. This change doesn't reduce the number of tests because it's already skipped on main.
oliversun9
commented
Oct 16, 2023
| @@ -1,4 +1,5 @@ | |||
| version: v1 | |||
| directories: | |||
| - a/proto | |||
There was a problem hiding this comment.
Added a third module to test for the behavior when there are two potential dependency modules, which is what the bug is about. I verified that this fails on main and passes on this branch.
|
Verified that running |
bufdev
approved these changes
Oct 16, 2023
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.
Fixes #2480
This fixes the problem where in some occasions dependencies from workspace are not loaded correctly when
--pathis passed. For example,buf build workspacedir/a --path workspacedir/a/foo.protowhenworkspacedir/bandworkspacedir/calso exist. Inmodule_file_set_builder.gomodule b and module c would be hashed based on theirTargetFileInfos, which are both empty slices due to the--pathfilter. Same hash means only one of them gets added to the list of potential dependencies.In this PR, workspace modules are distinguished by their directories relative to the workspace directory. This is accomplished by adding
WorkspaceDirectoryto interfacebufmodule.Module.