Skip to content

Commit

Permalink
Added more logging, tweaking linter
Browse files Browse the repository at this point in the history
  • Loading branch information
mrz1836 committed Oct 3, 2020
1 parent e9a370f commit 2e6e5fd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
7 changes: 7 additions & 0 deletions .make/Makefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 ./...
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
@$(MAKE) godocs

0 comments on commit 2e6e5fd

Please sign in to comment.