-
Notifications
You must be signed in to change notification settings - Fork 517
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add "checkgenerate" make target to CI (#385)
- Loading branch information
Showing
15 changed files
with
1,203 additions
and
1,057 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 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 |
---|---|---|
@@ -1,3 +1,4 @@ | ||
dist/ | ||
.idea/ | ||
VERSION | ||
.tmp/ |
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 |
---|---|---|
@@ -1,12 +1,16 @@ | ||
dev_build_version=$(shell git describe --tags --always --dirty) | ||
|
||
export PATH := $(shell pwd)/.tmp/protoc/bin:$(PATH) | ||
|
||
export PROTOC_VERSION := 22.0 | ||
|
||
# TODO: run golint and errcheck, but only to catch *new* violations and | ||
# decide whether to change code or not (e.g. we need to be able to whitelist | ||
# violations already in the code). They can be useful to catch errors, but | ||
# they are just too noisy to be a requirement for a CI -- we don't even *want* | ||
# to fix some of the things they consider to be violations. | ||
.PHONY: ci | ||
ci: deps checkgofmt vet staticcheck ineffassign predeclared test | ||
ci: deps checkgofmt checkgenerate vet staticcheck ineffassign predeclared test | ||
|
||
.PHONY: deps | ||
deps: | ||
|
@@ -31,6 +35,19 @@ docker: | |
docker build -t fullstorydev/grpcurl:$(dev_build_version) . | ||
@rm VERSION | ||
|
||
.PHONY: generate | ||
generate: .tmp/protoc/bin/protoc | ||
@go install google.golang.org/protobuf/cmd/protoc-gen-go@a709e31e5d12 | ||
@go install google.golang.org/grpc/cmd/[email protected] | ||
go generate ./... | ||
|
||
.PHONY: checkgenerate | ||
checkgenerate: generate | ||
git status --porcelain | ||
@if [ -n "$$(git status --porcelain)" ]; then \ | ||
exit 1; \ | ||
fi | ||
|
||
.PHONY: checkgofmt | ||
checkgofmt: | ||
gofmt -s -l . | ||
|
@@ -44,7 +61,7 @@ vet: | |
|
||
.PHONY: staticcheck | ||
staticcheck: | ||
@go install honnef.co/go/tools/cmd/staticcheck@v0.3.3 | ||
@go install honnef.co/go/tools/cmd/staticcheck@v0.4.3 | ||
staticcheck ./... | ||
|
||
.PHONY: ineffassign | ||
|
@@ -72,3 +89,7 @@ errcheck: | |
.PHONY: test | ||
test: | ||
go test -race ./... | ||
|
||
.tmp/protoc/bin/protoc: ./Makefile ./download_protoc.sh | ||
./download_protoc.sh | ||
|
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 |
---|---|---|
@@ -0,0 +1,35 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e | ||
|
||
cd $(dirname $0) | ||
|
||
if [[ -z "$PROTOC_VERSION" ]]; then | ||
echo "Set PROTOC_VERSION env var to indicate the version to download" >&2 | ||
exit 1 | ||
fi | ||
PROTOC_OS="$(uname -s)" | ||
PROTOC_ARCH="$(uname -m)" | ||
case "${PROTOC_OS}" in | ||
Darwin) PROTOC_OS="osx" ;; | ||
Linux) PROTOC_OS="linux" ;; | ||
*) | ||
echo "Invalid value for uname -s: ${PROTOC_OS}" >&2 | ||
exit 1 | ||
esac | ||
|
||
# This is for macs with M1 chips. Precompiled binaries for osx/amd64 are not available for download, so for that case | ||
# we download the x86_64 version instead. This will work as long as rosetta2 is installed. | ||
if [ "$PROTOC_OS" = "osx" ] && [ "$PROTOC_ARCH" = "arm64" ]; then | ||
PROTOC_ARCH="x86_64" | ||
fi | ||
|
||
PROTOC="${PWD}/.tmp/protoc/bin/protoc" | ||
|
||
if [[ "$(${PROTOC} --version 2>/dev/null)" != "libprotoc 3.${PROTOC_VERSION}" ]]; then | ||
rm -rf ./.tmp/protoc | ||
mkdir -p .tmp/protoc | ||
curl -L "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-${PROTOC_OS}-${PROTOC_ARCH}.zip" > .tmp/protoc/protoc.zip | ||
pushd ./.tmp/protoc && unzip protoc.zip && popd | ||
fi | ||
|
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
Oops, something went wrong.