[v11] Use one Buf workspace instead of three#19990
Merged
ravicious merged 1 commit intobranch/v11from Jan 9, 2023
Merged
Conversation
strideynet
approved these changes
Jan 9, 2023
codingllama
approved these changes
Jan 9, 2023
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.
Backport #19774.
Here I had a tricky conflict in genprotos.sh. There's a bunch of commits on master which add
buf generatecalls but those commits are not backported to v11 (compare commits between Aug 29, 2022 and Jan 9, 2023).v11 does just
buf generateat the moment. Before the signle workspace was introduced, this command would generate protos only for modules defined in the topmostbuf.work.yamlwhich used to be justapi/protoandproto, without prehog and teleterm.The strategy I picked to solve this conflict was "Make it so that running
make grpcandmake grpc-teletermdoesn't introduce any changes" which boiled down to replacingbuf generatewith two separate calls forapi/protoandproto.Another strategy I could've picked was "Bring v11 up to par with master". This would mean backporting the individual changes from those missing commits. There's not that many of them but at the same time those commits introduce other features/changes which might not end up being backported to v11. I could go around and ask but OTOH if the given team eventually decides to backport their commits, doing so should be straightforward.
The missing commits are related to:
lib/devicetrustis not on v11 so I assume it won't be backported.make grpc: I'm not sure if the reporting team will need to be able to backport any proto changes to v11. The reason we introduced a single workspace in the first place was importing lib/prehog protos from lib/teleterm and I know that this most likely will not be backported into v11 and will land in v12.