Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
arvindbr8 committed Apr 5, 2024
1 parent ba2024e commit 4d76db6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
File renamed without changes.
24 changes: 18 additions & 6 deletions scripts/vet-proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,30 @@
set -ex # Exit on error; debugging enabled.
set -o pipefail # Fail a pipe if any sub-command fails.

source "$(dirname $0)/util.sh" || exit 1
# - Source them sweet sweet helpers.
source "$(dirname $0)/vet-common.sh"

# - Install protoc if requested.
# - Check to make sure it's safe to modify the user's git repo.
git status --porcelain | fail_on_output

# - Undo any edits made by this script.
cleanup() {
git reset --hard HEAD
}
trap cleanup EXIT

# - Installs protoc into your ${GOBIN} directory, if requested.
# ($GOBIN might not be the best place for the protoc binary, but is at least
# consistent with the place where all binaries installed by scripts in this repo
# go.)
if [[ "$1" = "-install" ]]; then
if [[ "${GITHUB_ACTIONS}" = "true" ]]; then
PROTOBUF_VERSION=25.2 # Shows up in pb.go files as v4.22.0
PROTOC_FILENAME=protoc-${PROTOBUF_VERSION}-linux-x86_64.zip
pushd /home/runner/go
wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${PROTOC_FILENAME}
unzip ${PROTOC_FILENAME}
bin/protoc --version
wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${PROTOC_FILENAME}
unzip ${PROTOC_FILENAME}
protoc --version # Check that the binary works.
popd
else
# TODO: replace with install protoc when https://github.com/grpc/grpc-go/pull/7064 is merged.
Expand All @@ -25,7 +38,6 @@ elif [[ "$#" -ne 0 ]]; then
die "Unknown argument(s): $*"
fi


# - Check that generated proto files are up to date.
go generate google.golang.org/grpc/... && git status --porcelain 2>&1 | fail_on_output || \
(git status; git --no-pager diff; exit 1)
Expand Down
2 changes: 1 addition & 1 deletion scripts/vet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -ex # Exit on error; debugging enabled.
set -o pipefail # Fail a pipe if any sub-command fails.

source "$(dirname $0)/util.sh" || exit 1
source "$(dirname $0)/vet-common.sh"

# Check to make sure it's safe to modify the user's git repo.
git status --porcelain | fail_on_output
Expand Down

0 comments on commit 4d76db6

Please sign in to comment.