From d02f851c82cf567e056705c804e86e8404c34dda Mon Sep 17 00:00:00 2001 From: skeris Date: Sun, 8 Dec 2024 16:10:21 +0300 Subject: [PATCH] add lint and deploy pipelines --- .gitea/workflows/deploy.yml | 24 ++++++++++++++++++++++++ .gitea/workflows/lint.yml | 14 ++++++++++++++ Taskfile.dist.yml | 4 ++-- cmd/verification/main.go | 3 ++- go.mod | 3 ++- go.sum | 4 ++-- script/main.go | 2 +- 7 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 .gitea/workflows/deploy.yml create mode 100644 .gitea/workflows/lint.yml diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..621c870 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,24 @@ +name: Deploy +run-name: ${{ gitea.actor }} build image and push to container registry + +on: + push: + branches: + - 'main' + - 'staging' + +jobs: + CreateImage: + runs-on: [apimetrics] + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.0.1 + with: + runner: apimetrics + secrets: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + DeployService: + runs-on: [apimetrics] + needs: CreateImage + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.0.1 + with: + runner: apimetrics diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml new file mode 100644 index 0000000..0bd7867 --- /dev/null +++ b/.gitea/workflows/lint.yml @@ -0,0 +1,14 @@ +name: Lint +run-name: ${{ gitea.actor }} produce linting + +on: + push: + branches: + - 'dev' + +jobs: + Lint: + runs-on: [hubstaging] + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2 + with: + runner: hubstaging diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml index c96d07c..bac807b 100644 --- a/Taskfile.dist.yml +++ b/Taskfile.dist.yml @@ -3,8 +3,8 @@ version: "3" tasks: update-linter: cmds: - - go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git + - go get -u gitea.pena/PenaSide/linters-golang 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 + - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang)/.golangci.yml diff --git a/cmd/verification/main.go b/cmd/verification/main.go index 58437eb..275a5a1 100644 --- a/cmd/verification/main.go +++ b/cmd/verification/main.go @@ -6,7 +6,8 @@ import ( "os" "gitea.pena/PenaSide/verification/internal/app" "gitea.pena/PenaSide/verification/internal/config" - _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" + + _ "gitea.pena/PenaSide/linters-golang/pkg/dummy" "time" ) diff --git a/go.mod b/go.mod index a104359..78568b8 100644 --- a/go.mod +++ b/go.mod @@ -17,9 +17,10 @@ require ( github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf go.mongodb.org/mongo-driver v1.14.0 go.uber.org/zap v1.27.0 - penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 ) +require gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 + require ( github.com/ClickHouse/clickhouse-go v1.5.4 // indirect github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect diff --git a/go.sum b/go.sum index 549e36a..1699fe2 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9N gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= gitea.pena/PenaSide/customer v0.0.0-20241118214409-34a88a3a7001 h1:bnwlhVx7LzwAYgx25G8/qezqkXvatL1de9nQZvpO0IE= gitea.pena/PenaSide/customer v0.0.0-20241118214409-34a88a3a7001/go.mod h1:6lKbvPc2E2TcNSxG8WlC/XBuhqW6smKQtpYPLedheqU= +gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 h1:jDVeUhGBTXBibmW5dmtJg2m2+z5z2Rf6J4G0LpjVoJ0= +gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4/go.mod h1:Bp5fJX0XsTV3QYximX6R2kCRvVKQAPwxjjCPm+ToTY8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -237,5 +239,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -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= diff --git a/script/main.go b/script/main.go index a4ac232..bbf0826 100644 --- a/script/main.go +++ b/script/main.go @@ -8,7 +8,7 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "penahub.gitlab.yandexcloud.net/backend/verification/internal/models" + "gitea.pena/PenaSide/verification/internal/models" ) const (