From 9322e85aa97fd4b7810a2c7e557a496b11874f24 Mon Sep 17 00:00:00 2001 From: skeris Date: Tue, 13 Aug 2024 14:12:52 +0300 Subject: [PATCH] add linter --- .gitignore | 1 + .gitlab-ci.yml | 6 ++++++ Taskfile.dist.yml | 10 ++++++++++ cmd/main.go | 2 ++ go.mod | 5 ++++- go.sum | 2 ++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Taskfile.dist.yml diff --git a/.gitignore b/.gitignore index da9801a..2433a30 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ fabric.properties # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,goland,go main +.golangci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a97c07..0ffae13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,18 @@ include: file: "/templates/docker/build-template.gitlab-ci.yml" - project: "devops/pena-continuous-integration" file: "/templates/docker/deploy-template.gitlab-ci.yml" + - project: "devops/pena-continuous-integration" + file: "/templates/docker/golint.gitlab-ci.yml" stages: + - lint - build - migrate - deploy +lint: + extends: .golint_template + build-app: stage: build extends: .build_template diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml new file mode 100644 index 0000000..c96d07c --- /dev/null +++ b/Taskfile.dist.yml @@ -0,0 +1,10 @@ +version: "3" + +tasks: + update-linter: + cmds: + - go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git + lint: + cmds: + - task: update-linter + - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m penahub.gitlab.yandexcloud.net/devops/linters/golang.git)/.golangci.yml diff --git a/cmd/main.go b/cmd/main.go index 68bc347..ad560de 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -11,6 +11,8 @@ import ( "amocrm/internal/app" "go.uber.org/zap" + // import for automatically updating linter rules + _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" ) func main() { diff --git a/go.mod b/go.mod index 110c067..813878a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module amocrm -go 1.21.6 +go 1.22.0 + +toolchain go1.22.2 require ( github.com/caarlos0/env/v8 v8.0.0 @@ -55,4 +57,5 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6 // indirect + penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240803124813-79e62d2acf3c // indirect ) diff --git a/go.sum b/go.sum index d9c390e..77e8d9b 100644 --- a/go.sum +++ b/go.sum @@ -148,3 +148,5 @@ penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240628183520-892 penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240628183520-89234a64c7fe/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240710173639-ae1b5abeb71f h1:AsazJV1Z1eCCKSTylddZnRp8ziy2YZofv7/AyPqqtXM= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240710173639-ae1b5abeb71f/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= +penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240803124813-79e62d2acf3c h1:imtXaIVscs8it6SfAmDxjNxqQSF44GgCTl1N6JT6unA= +penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240803124813-79e62d2acf3c/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY=