diff --git a/.travis.yml b/.travis.yml index 56e5c59..1b29bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,13 @@ notifications: email: false # Install before running scripts -#before_script: -# - make install-lint-ci +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 + - $GOPATH/bin/golangci-lint run # After build success after_success: diff --git a/Makefile b/Makefile index 4798adf..b03d439 100644 --- a/Makefile +++ b/Makefile @@ -24,10 +24,8 @@ clean: ## Remove previous builds and any test cache data @test $(DISTRIBUTIONS_DIR) @if [ -d $(DISTRIBUTIONS_DIR) ]; then rm -r $(DISTRIBUTIONS_DIR); fi -lint:: ## Installs the linter and runs - @if [ "$(shell command -v golangci-lint)" = "" ]; then curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.8; fi - @golangci-lint - #@curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.31.0 +lint:: ## Runs the golangci-lint tool + @golangci-lint run release:: ## Runs common.release then runs godocs @$(MAKE) godocs