Skip to content

Commit

Permalink
Use the same protoc version (3.21.12) everywhere (#1491)
Browse files Browse the repository at this point in the history
Re-generate proto files with version 3.21.12 and recommend installing
that version. This way generating protos doesn't result in local diffs.

I've verified this is the same version used by the Docker images for
mixer push as well as custom DC services:
- `docker run -it --entrypoint /bin/bash -e DEBUG=true
gcr.io/datcom-ci/go-protoc:latest` -> `protoc --version`
- `docker run -it --entrypoint /bin/bash -e DEBUG=true
gcr.io/datcom-ci/datacommons-services:latest` -> `apt show
protobuf-compiler`

The website repo dev guide will also need to be updated to recommend
this version (it currently recommends v3.21.9).
  • Loading branch information
hqpho authored Jan 8, 2025
1 parent 939a584 commit 29c95a8
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion docs/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

- [`gcloud`](https://cloud.google.com/sdk/docs/install)
- [`Golang`](https://golang.org/doc/install)
- [`protoc`](http://google.github.io/proto-lens/installing-protoc.html)
- [`protoc`](http://google.github.io/proto-lens/installing-protoc.html) at version 3.21.12
- If using Homebrew, run `brew install protobuf@21` and be sure to update your path as described in the output (likely it'll instruct you to run `echo 'export PATH="/opt/homebrew/opt/protobuf@21/bin:$PATH"' >> ~/.zshrc`).

Make sure to add `GOPATH` and update `PATH`:

Expand Down
2 changes: 1 addition & 1 deletion internal/proto/service/mixer.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/proto/service/mixer_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/proto/v3/node.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/proto/v3/node_search.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/proto/v3/observation.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/proto/v3/resolve.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 29c95a8

Please sign in to comment.