mirror of https://github.com/linkerd/linkerd2.git
chore: remove the bin/protoc script (#13459)
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. This change removes the unused script.
This commit is contained in:
Oliver Gould
GitHub
parent
f80bf6d5ea
commit
08a6dba655
|
|
@ -20,4 +20,5 @@ jobs:
|
|||
- run: apt update && apt install -y unzip
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
- run: bin/protoc-diff
|
||||
- run: bin/protoc-go.sh
|
||||
- run: git diff --exit-code
|
||||
|
|
|
|||
40
bin/protoc
40
bin/protoc
|
|
@ -1,40 +0,0 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
set -eu
|
||||
|
||||
if [ "$(uname -s)" = Darwin ]; then
|
||||
os=osx
|
||||
else
|
||||
os=linux
|
||||
fi
|
||||
arch=$(uname -m)
|
||||
|
||||
bindir=$( cd "${0%/*}" && pwd )
|
||||
targetbin=$( cd "$bindir"/.. && pwd )/target/bin
|
||||
protocversion=3.20.0
|
||||
protocbin=$targetbin/protoc-$protocversion
|
||||
protocurl=https://github.com/google/protobuf/releases/download/v$protocversion/protoc-$protocversion-$os-$arch.zip
|
||||
|
||||
require_from() {
|
||||
if ! command -v "$1" >/dev/null 2>/dev/null ; then
|
||||
echo "Please acquire $1 from $2" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
if [ ! -f "$protocbin" ]; then
|
||||
require_from curl 'https://curl.se/download.html'
|
||||
require_from unzip 'http://infozip.sourceforge.net/UnZip.html#Downloads'
|
||||
tmp=$(mktemp -d -t protoc.XXX)
|
||||
mkdir -p "$targetbin"
|
||||
(
|
||||
cd "$tmp"
|
||||
"$bindir"/scurl -o "./protoc.zip" "$protocurl"
|
||||
unzip -q "./protoc.zip" bin/protoc
|
||||
chmod +x bin/protoc
|
||||
)
|
||||
mv "$tmp/bin/protoc" "$protocbin"
|
||||
rm -rf "$tmp"
|
||||
fi
|
||||
|
||||
"$protocbin" "$@"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
set -eu
|
||||
|
||||
bindir=$( cd "${0%/*}" && pwd )
|
||||
"$bindir"/protoc-go.sh
|
||||
|
||||
dir_dirty=$(git diff HEAD -- **/gen/**)
|
||||
if [ -z "$dir_dirty" ]; then
|
||||
echo 'Protobuf definitions match generated code'
|
||||
exit 0
|
||||
else
|
||||
echo 'Protobuf definitions diverge from generated code:'
|
||||
git status
|
||||
exit 64
|
||||
fi
|
||||
|
|
@ -2,21 +2,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/protoc-gen-go@v1.28
|
||||
go install -mod=readonly google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.35.2
|
||||
// protoc v3.20.0
|
||||
// protoc v5.29.0
|
||||
// source: common/net.proto
|
||||
|
||||
package net
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.35.2
|
||||
// protoc v3.20.0
|
||||
// protoc v5.29.0
|
||||
// source: viz.proto
|
||||
|
||||
package viz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||
// versions:
|
||||
// - protoc-gen-go-grpc v1.5.1
|
||||
// - protoc v3.20.0
|
||||
// - protoc v5.29.0
|
||||
// source: viz.proto
|
||||
|
||||
package viz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.35.2
|
||||
// protoc v3.20.0
|
||||
// protoc v5.29.0
|
||||
// source: viz_tap.proto
|
||||
|
||||
package tap
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||
// versions:
|
||||
// - protoc-gen-go-grpc v1.5.1
|
||||
// - protoc v3.20.0
|
||||
// - protoc v5.29.0
|
||||
// source: viz_tap.proto
|
||||
|
||||
package tap
|
||||
|
|
|
|||
Loading…
Reference in New Issue