diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aaede0b..edbeabd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,16 @@ 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 - deploy +lint: + extends: .golint_template + build-app: 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/feedback/main.go b/cmd/feedback/main.go index 642d6e4..52032e0 100644 --- a/cmd/feedback/main.go +++ b/cmd/feedback/main.go @@ -6,6 +6,7 @@ import ( "os" "penahub.gitlab.yandexcloud.net/backend/templategen_feedback/internal/app" "penahub.gitlab.yandexcloud.net/backend/templategen_feedback/internal/config" + _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" "time" ) diff --git a/go.mod b/go.mod index 6bce64d..f552714 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module penahub.gitlab.yandexcloud.net/backend/templategen_feedback -go 1.21 +go 1.22.0 toolchain go1.22.2 @@ -15,6 +15,7 @@ require ( go.etcd.io/bbolt v1.3.7 go.uber.org/zap v1.27.0 penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c + penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31 ) diff --git a/go.sum b/go.sum index 1281bb4..eca6b9a 100644 --- a/go.sum +++ b/go.sum @@ -294,9 +294,9 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607142502-8257e6c4aa5a h1:dGW8ErUVdwGJBq6uc5AHYn6Yt10CDNkMIpV+yrDDTLs= -penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607142502-8257e6c4aa5a/go.mod h1:+bPxq2wfW5S1gd+83vZYmHm33AE7nEBfznWS8AM1TKE= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c h1:CWb4UcuNXhd1KTNOmy2U0TJO4+Qxgxrj5cwkyFqbgrk= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c/go.mod h1:+bPxq2wfW5S1gd+83vZYmHm33AE7nEBfznWS8AM1TKE= +penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 h1:sf6e2mp582L3i/FMDd2q6QuWm1njRXzYpIX0SipsvM4= +penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY= penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31 h1:WlRVJnzU0sti+qBq/JTCgFPU0RoxIqGHu7hzDirxE2k= penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31/go.mod h1:3ml0dAGT8U8RhpevKBfRgG6yKZum8EI2uJxAb2WCIy4=