-
Notifications
You must be signed in to change notification settings - Fork 18
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
Resolve dependencies from both host go.mod and module's go.mod #225
Merged
janhancic
merged 9 commits into
please-build:master
from
janhancic:resolve-subrepo-go-mod-too
Feb 9, 2024
Merged
Resolve dependencies from both host go.mod and module's go.mod #225
janhancic
merged 9 commits into
please-build:master
from
janhancic:resolve-subrepo-go-mod-too
Feb 9, 2024
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
Previously we would only look at the host repo's go.mod or the module's go.mod, but not both. This changes makes it so that we always look at both available go.mod files and add logic to prevent reading the `replace` directives in the module's go.mod if we also have the host repo's go.mod configured.
goddenrich
approved these changes
Feb 7, 2024
Not sure if we can test the expected replace directive behaviour here. Theres a bit of complexity there thats not obvious that could do with a test. |
Tatskaari
approved these changes
Feb 8, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice one Jan!
You could bump tools/please_go/VERSION
and tools/please_go/ChangeLog
in this PR if you want.
goddenrich
approved these changes
Feb 8, 2024
If the host go.mod file contains a `replace` directive for a module that we are generating and the directive only changes the version, the dependency resolution went into an infinite recursion. Update the code so that we use strict parsing only for the host repo's go.mod and not for the module's, as that can cause issues.
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.
Previously we would only look at the host repo's go.mod or the module's go.mod, but not both.
This changes makes it so that we always look at both available go.mod files and add logic to prevent reading the
replace
directives in the module's go.mod if we also have the host repo's go.mod configured.Another notable change is to use
gomod.Parse
instead ofgomod.ParseLax
for the host repo. It turns out we weren't actually parsing thereplace
directives (the map was always empty). It didn't cause issues internally because we only use thereplace
directives to change versions, and not paths.