Change gometalinter to golangci-lint

threefoldtech · Sep 30, 2019 · 2d295da · 2d295da
1 parent 805ce92
commit 2d295da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,11 @@ jobs:
     - stage: test
       language: go
       go:
-        - 1.9.x
-        - 1.10.x
+        - 1.12.x
+        - 1.13.x
       sudo: false
       install:
-        - go get -v github.com/alecthomas/gometalinter
-        - gometalinter --install
+        - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.19.1
       script:
         - export PATH=$PATH:$HOME/gopath/bin
         - make all

diff --git a/Makefile b/Makefile
@@ -14,13 +14,13 @@ btcatomicswap:
 test: test-linter test-go
 
 test-linter:
-	test -z "$(shell gometalinter --vendor --disable-all \
+	test -z "$(shell golangci-lint run  --no-config --disable-all \
 		--enable=gofmt \
 		--enable=vet \
 		--enable=gosimple \
 		--enable=unconvert \
 		--enable=ineffassign \
-		--deadline=10m ./... 2>&1 | tee /dev/stderr)"
+		--deadline=10m 2>&1 | tee /dev/stderr)"
 
 test-go:
 	go test -v -race $(testpkgs)