Switch to new linter

go-kivik · Jun 19, 2019 · 8d014d8 · 8d014d8
1 parent 054b069
commit 8d014d8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/.golangci.toml b/.golangci.toml
@@ -0,0 +1,9 @@
+[output]
+format = "colored-line-number"
+
+[linters]
+enable = [
+    "interfacer", "gocyclo", "unconvert", "goimports", "unused", "varcheck",
+    "vetshadow", "misspell", "nakedret", "errcheck", "golint", "ineffassign",
+    "deadcode", "goconst", "vet", "unparam", "gofmt"
+]
diff --git a/.linter.json b/.linter.json
diff --git a/.linter_test.json b/.linter_test.json
diff --git a/travis/install.sh b/travis/install.sh
@@ -18,8 +18,7 @@ case "$1" in
         generate
     ;;
     "linter")
-        go get -u gopkg.in/alecthomas/gometalinter.v1
-        gometalinter.v1 --install
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
     ;;
     "coverage")
         generate

diff --git a/travis/test.sh b/travis/test.sh
@@ -15,10 +15,7 @@ case "$1" in
         gopherjs test $(go list ./... | grep -v /vendor/ | grep -Ev 'kivik/(serve|auth|proxy)')
     ;;
     "linter")
-        diff -u <(echo -n) <(gofmt -e -d $(find . -type f -name '*.go' -not -path "./vendor/*"))
-        go install # to make gotype (run by gometalinter) happy
-        gometalinter.v1 --config .linter_test.json
-        gometalinter.v1 --config .linter.json
+        golangci-lint run ./...
     ;;
     "coverage")
         echo "" > coverage.txt