Conversation
Co-authored-by: Ramon Niebla <nieblara@users.noreply.github.com>
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
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.
Requirements
Related issues
Resolves the merge conflicts on #621 (
dependabot/go_modules/go.uber.org/mock-0.6.0). That PR isCONFLICTINGagainstmain(88 commits behind).Describe the solution you've provided
Re-applies only the intended direct bump on current
main:go.uber.org/mockv0.5.2→v0.6.0go.sumchecksums onlyThe original PR also tried to move
golang.org/x/{term,mod,net,sys,tools}to versions that are now older thanmain. Those hunks were dropped so this does not downgrade:golang.org/x/termstaysv0.40.0golang.org/x/modstaysv0.33.0golang.org/x/netstaysv0.50.0golang.org/x/sysstaysv0.41.0golang.org/x/toolsstaysv0.42.0No application source or mockgen changes.
go.uber.org/mockv0.6.0 is API-compatible here.Describe alternatives you've considered
Merging the Dependabot branch and hand-resolving go.mod/go.sum conflict markers. Recreating the bump on latest
mainis smaller and avoids replaying stale transitive pins.Additional context
go buildsucceeded. Packages that import mock (internal/dev_server/sdk,model,adapters) passed. Original PR 621 can be closed once this lands.