-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The bin/protoc script is ancient and not useful, especially in light of tools provided by dev containers. Furthermore, it includes a reference to an old gross sourcefource downlaod page for unzip. Furthermore, the protoc-go.sh script does seperate version pinning of build dependencies. To simplify all of this, this change removes the bin/protoc and bin/protoc-diff scripts. The "proto" CI workflow is updated to use the protoc-go.sh script directly.
- Loading branch information
Showing
9 changed files
with
1,371 additions
and
473 deletions.
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,19 +4,14 @@ set -eu | |
|
||
bindir=$( cd "${0%/*}" && pwd ) | ||
|
||
if ! command -v protoc-gen-go-grpc >/dev/null ; then | ||
go install -mod=readonly google.golang.org/protobuf/cmd/[email protected] | ||
go install -mod=readonly google.golang.org/grpc/cmd/[email protected] | ||
fi | ||
|
||
rm -rf controller/gen/common controller/gen/config viz/metrics-api/gen viz/tap/gen | ||
mkdir -p controller/gen/common/net viz/metrics-api/gen/viz viz/tap/gen/tap | ||
|
||
"$bindir"/protoc -I proto --go_out=paths=source_relative:controller/gen proto/common/net.proto | ||
"$bindir"/protoc -I proto -I viz/metrics-api/proto --go_out=paths=source_relative:viz/metrics-api/gen viz/metrics-api/proto/viz.proto | ||
"$bindir"/protoc -I proto -I viz/metrics-api/proto --go-grpc_out=paths=source_relative:viz/metrics-api/gen/viz viz/metrics-api/proto/viz.proto | ||
"$bindir"/protoc -I proto -I viz/tap/proto -I viz/metrics-api/proto --go_out=paths=source_relative:viz/tap/gen viz/tap/proto/viz_tap.proto | ||
"$bindir"/protoc -I proto -I viz/tap/proto -I viz/metrics-api/proto --go-grpc_out=paths=source_relative:viz/tap/gen/tap viz/tap/proto/viz_tap.proto | ||
protoc -I proto --go_out=paths=source_relative:controller/gen proto/common/net.proto | ||
protoc -I proto -I viz/metrics-api/proto --go_out=paths=source_relative:viz/metrics-api/gen viz/metrics-api/proto/viz.proto | ||
protoc -I proto -I viz/metrics-api/proto --go-grpc_out=paths=source_relative:viz/metrics-api/gen/viz viz/metrics-api/proto/viz.proto | ||
protoc -I proto -I viz/tap/proto -I viz/metrics-api/proto --go_out=paths=source_relative:viz/tap/gen viz/tap/proto/viz_tap.proto | ||
protoc -I proto -I viz/tap/proto -I viz/metrics-api/proto --go-grpc_out=paths=source_relative:viz/tap/gen/tap viz/tap/proto/viz_tap.proto | ||
|
||
mv controller/gen/common/net.pb.go controller/gen/common/net/ | ||
mv viz/metrics-api/gen/viz.pb.go viz/metrics-api/gen/viz/viz.pb.go | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.