Skip to content

Commit

Permalink
Try fix buildkite docker
Browse files Browse the repository at this point in the history
  • Loading branch information
wxing1292 committed Feb 18, 2021
1 parent 9073671 commit 3555394
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions Makefile
Expand Up @@ -12,10 +12,10 @@ all: update-tools clean proto bins check test
clean: clean-bins clean-test-results

# Recompile proto files.
proto: clean-proto install-proto-submodule buf-lint api-linter protoc fix-proto-path proto-mock goimports-proto copyright-proto
proto: clean-proto install-proto-submodule buf-lint protoc fix-proto-path proto-mock goimports-proto copyright-proto

# Update proto submodule from remote and recompile proto files.
update-proto: clean-proto update-proto-submodule buf-lint api-linter protoc fix-proto-path update-go-api proto-mock goimports-proto copyright-proto gomodtidy
update-proto: clean-proto update-proto-submodule buf-lint protoc fix-proto-path update-go-api proto-mock goimports-proto copyright-proto gomodtidy

# Build all docker images.
docker-images:
Expand Down Expand Up @@ -128,7 +128,6 @@ update-checkers:
GO111MODULE=off go get -u golang.org/x/lint/golint
GO111MODULE=off go get -u honnef.co/go/tools/cmd/staticcheck
GO111MODULE=off go get -u github.com/kisielk/errcheck
GO111MODULE=off go get -u github.com/googleapis/api-linter/cmd/api-linter
GO111MODULE=off go get -u github.com/bufbuild/buf/cmd/buf

update-mockgen:
Expand Down Expand Up @@ -247,10 +246,6 @@ errcheck:
@printf $(COLOR) "Run errcheck..."
@errcheck ./... || true

api-linter:
@printf $(COLOR) "Run api-linter..."
@api-linter --set-exit-status $(PROTO_IMPORTS) --config=$(PROTO_ROOT)/api-linter.yaml $(PROTO_FILES)

buf-lint:
@printf $(COLOR) "Run buf linter..."
@(cd $(PROTO_ROOT) && buf check lint)
Expand Down
2 changes: 1 addition & 1 deletion docker/buildkite/Dockerfile
Expand Up @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
time \
protobuf-compiler \
&& rm -rf /var/lib/apt/lists/* \
&& curl https://bootstrap.pypa.io/get-pip.py | python \
&& curl https://bootstrap.pypa.io/2.7/get-pip.py | python2 \
&& pip install PyYAML==3.13 \
&& go get -u github.com/axw/gocov/gocov \
&& go get -u github.com/mattn/goveralls \
Expand Down

0 comments on commit 3555394

Please sign in to comment.