diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 00000000..20ad14f9 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,20 @@ +run: + deadline: 5m + +linters: + enable: + - deadcode + - govet + - ineffassign + - interfacer + - maligned + - megacheck + - structcheck + - unconvert + - varcheck + enable-all: false + disable-all: true +# presets: +# - bugs +# - unused + fast: false diff --git a/.gometalinter.json b/.gometalinter.json deleted file mode 100644 index ac903f42..00000000 --- a/.gometalinter.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "Enable": [ - "deadcode", - "gotype", - "gotypex", - "ineffassign", - "interfacer", - "maligned", - "megacheck", - "structcheck", - "unconvert", - "varcheck", - "vet" - ], - "Disable": [ - "dupl", - "errcheck", - "gochecknoglobals", - "gochecknoinits", - "goconst", - "gocyclo", - "gofmt", - "goimports", - "golint", - "gosec", - "gosimple", - "lll", - "misspell", - "nakedret", - "safesql", - "staticcheck", - "test", - "testify", - "unparam", - "unused", - "vetshadow" - ] -} diff --git a/.travis.yml b/.travis.yml index 20e27616..89a5034e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ cache: jobs: include: - stage: lint - script: "./build/run_gometalinter.sh" + script: "./build/run_linters.sh" - stage: test script: "./build/build_all.sh" deploy: diff --git a/build/run_gometalinter.sh b/build/run_gometalinter.sh deleted file mode 100755 index 8ed2fdc0..00000000 --- a/build/run_gometalinter.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0)/.. - -dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s ./...' - -WDIR="/go/src/github.com/filebrowser/filebrowser" - -if [ "$USE_DOCKER" != "" ]; then - $(command -v winpty) docker run --rm -itv "/$(pwd):/$WDIR" -w "/$WDIR" filebrowser/dev sh -c "\ - GO111MODULE=on go get -v ./... && \ - GO111MODULE=on go mod vendor && \ - GO111MODULE=off $dolint" -else - $dolint -fi diff --git a/build/run_linters.sh b/build/run_linters.sh new file mode 100755 index 00000000..cef68670 --- /dev/null +++ b/build/run_linters.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +cd $(dirname $0)/.. + +if [ "$USE_DOCKER" != "" ]; then + $(command -v winpty) docker run --rm -itv "/$(pwd)://src" -w "//src" filebrowser/dev sh -c "\ + go get -v ./... && \ + golangci-lint run -v" +else + golangci-lint run -v +fi