From 2e6e5fdaf5be7cfe68c8699504378e3572c165a5 Mon Sep 17 00:00:00 2001 From: mrz1836 Date: Sat, 3 Oct 2020 12:37:14 -0400 Subject: [PATCH] Added more logging, tweaking linter --- .make/Makefile.go | 7 +++++++ .travis.yml | 4 ---- Makefile | 5 +---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.make/Makefile.go b/.make/Makefile.go index 08d566d..851053d 100644 --- a/.make/Makefile.go +++ b/.make/Makefile.go @@ -47,18 +47,22 @@ lint: ## Run the golangci-lint application (install if not found) test: ## Runs vet, lint and ALL tests @$(MAKE) lint + @echo "running tests..." @go test ./... -v test-short: ## Runs vet, lint and tests (excludes integration tests) @$(MAKE) lint + @echo "running tests (short)..." @go test ./... -v -test.short test-travis: ## Runs all tests via Travis (also exports coverage) @$(MAKE) lint + @echo "running tests..." @go test ./... -race -coverprofile=coverage.txt -covermode=atomic test-travis-short: ## Runs unit tests via Travis (also exports coverage) @$(MAKE) lint + @echo "running tests (short)..." @go test ./... -test.short -race -coverprofile=coverage.txt -covermode=atomic uninstall: ## Uninstall the application (and remove files) @@ -73,6 +77,9 @@ uninstall: ## Uninstall the application (and remove files) update: ## Update all project dependencies @go get -u ./... && go mod tidy +update-linter: ## Update the golangci-lint package (macOS only) + @brew upgrade golangci-lint + vet: ## Run the Go vet application @echo "running go vet..." @go vet -v ./... \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 16be424..abd6f1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,6 @@ git: notifications: email: false -# Install linter before running scripts -#before_script: -# - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.31.0 - # Run all scripts script: - make test-travis diff --git a/Makefile b/Makefile index 1da0f51..e44677b 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,4 @@ clean: ## Remove previous builds and any test cache data @if [ -d $(DISTRIBUTIONS_DIR) ]; then rm -r $(DISTRIBUTIONS_DIR); fi release:: ## Runs common.release then runs godocs - @$(MAKE) godocs - -update-linter: ## Update the golangci-lint package - @brew upgrade golangci-lint \ No newline at end of file + @$(MAKE) godocs \ No newline at end of file