From 182ff2e1b79a6914714d50e22634fa653c735bb2 Mon Sep 17 00:00:00 2001 From: Robert Lin Date: Fri, 20 Apr 2018 03:00:02 -0700 Subject: [PATCH] Update lint scripts --- .travis.yml | 7 ++++--- Makefile | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1f1071e..ce68d759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,17 +31,18 @@ matrix: fast_finish: true before_install: + - go get -u github.com/mattn/goveralls - go get -u github.com/golang/dep/cmd/dep - make deps # Build daemon, run tests, and make various code quality checks script: - make testenv VPS_OS="$VPS_OS" VPS_VERSION="$VERSION" SSH_PORT=69 - - make testdaemon SSH_PORT=69 # Send test daemon to test VPS + - make testdaemon SSH_PORT=69 # Send test daemon to testVPS - go test -v -race -coverprofile=coverage.out ./... # Execute tests - goveralls -coverprofile=coverage.out -service=travis-ci -repotoken "$COVERALLS_TOKEN" - - ./bin/gometalinter --vendor ./... # Static code analysis - - docker kill $(docker ps -q) # Remove testvps, etc + - make lint # Static code analysis + - docker kill $(docker ps -q) # Remove testvps, etc # Push version-tagged Docker image and build platform binaries before_deploy: diff --git a/Makefile b/Makefile index bfe15e59..3291be8a 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ clean: find . -type f -name inertia.\* -exec rm {} \; lint: - ./bin/gometalinter --vendor ./... + PATH=$(PATH):./bin bash -c './bin/gometalinter --vendor ./...' # Run unit test suite test: