build: don't require a specific protoc version #2743
Merged
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
conorsch
force-pushed
the
2736-chiller-proto-linting
branch
from
85db24b to
f2d6b21
Compare
hdevalence
reviewed
Jun 27, 2023
Comment on lines
81
to
92
| ./deployments/scripts/protobuf-codegen | ||
| s="$(git status --porcelain)" | ||
| if [[ -n "$s" ]]; then | ||
| echo "ERROR: protobuf files must be regenerated and committed." | ||
| echo "Run this command locally: ./deployments/scripts/protobuf-codegen" | ||
| echo "Make sure you're running protoc $(cut -f1 -d. <<< ${PROTOC_VERSION}).x locally." | ||
| echo "These are the files that reported differences:" | ||
| echo "$s" | ||
| exit 1 | ||
| else | ||
| echo "OK: no changes required to protobuf specs" | ||
| fi |
There was a problem hiding this comment.
We do want to check for changes in the generated proto code, though, just not changes to the proto descriptor.
There was a problem hiding this comment.
OK, I'll make that change. That means we'll still have failing CI for some cosmetic-only changes such as https://github.com/penumbra-zone/penumbra/pull/2739/files#diff-4c7f8084527df765ac0133b6828891e9b82fb03557bacf323960235942b56c3aR3, but those should be easily sorted with a bit of visual inspection.
conorsch
force-pushed
the
2736-chiller-proto-linting
branch
from
f2d6b21 to
15e933e
Compare
Let's dial down the strictness on the protobuf codegen story. Here we retain the docs changes from #2739, but drop the requirement for a specific major version of `protoc`. Similarly, we remove the CI check that fails if diffs are detected in the generated `proto_descriptor.bin` file, because often those diffs are cosmetic, rather than substantive. We preserve the CI check for ensuring there are no diff elsewhere in the codegen outputs. Closes #2736.
conorsch
force-pushed
the
2736-chiller-proto-linting
branch
from
15e933e to
e52ce11
Compare
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.
Let's dial down the strictness on the protobuf codegen story. Here we retain the docs changes from #2739, but drop the requirement for a specific major version of
protoc. Similarly, we remove the CI check that fails if diffs are detected in the generatedproto_descriptor.binfile, because often those diffs are cosmetic, rather than substantive. We preserve the CI check for ensuring there are no diff elsewhere in the codegen outputs.Closes #2736.