diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9a7d07f612348924e2fba2388c641a027f15625..0c7e0872d48dd17b0337193ffca005a266ad57f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: - build - trigger-deploy lint: - image: golangci/golangci-lint:v1.50.1 + image: golangci/golangci-lint:latest stage: test tags: - amd64-docker @@ -20,8 +20,8 @@ lint: - golangci-lint --version - golangci-lint run before_script: - - ln -s /builds /go/src/gitlab.com - - cd /go/src/gitlab.com/${CI_PROJECT_PATH} + - ln -s /builds /go/src/code.vereign.com + - cd /go/src/code.vereign.com/${CI_PROJECT_PATH} unit tests: image: golang:${GO_VERSION} @@ -38,8 +38,8 @@ govulncheck: tags: - amd64-docker before_script: - - ln -s /builds /go/src/gitlab.com - - cd /go/src/gitlab.com/${CI_PROJECT_PATH} + - ln -s /builds /go/src/code.vereign.com + - cd /go/src/code.vereign.com/${CI_PROJECT_PATH} script: - go version - go install golang.org/x/vuln/cmd/govulncheck@latest diff --git a/.golangci.yml b/.golangci.yml index a31b66b24000f23ec82f765c828a26cf2bef07bd..deac9cf0c47bf49648d2bd828f6fe2b1b749e554 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,16 +1,17 @@ run: - deadline: 5m - skip-dirs: + timeout: 5m + +issues: + exclude-dirs: - vendor/ - .*fakes/ - .*generated/ - skip-files: + exclude-files: - .*generated.go linters: disable-all: true enable: - - megacheck - govet - errcheck - goconst @@ -20,10 +21,8 @@ linters: - gosec - ineffassign - nakedret - - staticcheck - unconvert - - vet - - vetshadow - misspell - staticcheck - unused + - gosimple