This commit is contained in:
Alex Collins 2019-03-30 22:14:35 -07:00 committed by GitHub
parent 59837cb513
commit ae41425c77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -45,6 +45,7 @@ go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
go get -u github.com/mattn/goreman
go get -u gotest.tools/gotestsum
```
## Building

View file

@ -9,6 +9,7 @@ GIT_COMMIT=$(shell git rev-parse HEAD)
GIT_TAG=$(shell if [ -z "`git status --porcelain`" ]; then git describe --exact-match --tags HEAD 2>/dev/null; fi)
GIT_TREE_STATE=$(shell if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi)
PACKR_CMD=$(shell if [ "`which packr`" ]; then echo "packr"; else echo "go run vendor/github.com/gobuffalo/packr/packr/main.go"; fi)
TEST_CMD=$(shell [ "`which gotestsum`" != "" ] && echo gotestsum -- || echo go test)
# docker image publishing options
DOCKER_PUSH=false
@ -130,16 +131,16 @@ lint:
golangci-lint run --fix
.PHONY: build
build: lint
build:
go build `go list ./... | grep -v resource_customizations`
.PHONY: test
test: build
go test -covermode=count -coverprofile=coverage.out `go list ./... | grep -v "github.com/argoproj/argo-cd/test/e2e"`
test:
$(TEST_CMD) -covermode=count -coverprofile=coverage.out `go list ./... | grep -v "github.com/argoproj/argo-cd/test/e2e"`
.PHONY: test-e2e
test-e2e: cli
go test -v -failfast -timeout 20m ./test/e2e
$(TEST_CMD) -v -failfast -timeout 20m ./test/e2e
# Cleans VSCode debug.test files from sub-dirs to prevent them from being included in packr boxes
.PHONY: clean-debug
@ -151,7 +152,7 @@ clean: clean-debug
-rm -rf ${CURRENT_DIR}/dist
.PHONY: pre-commit
pre-commit: dep-ensure codegen test
pre-commit: dep-ensure codegen build lint test
.PHONY: release-precheck
release-precheck: manifests