merge commit 5193e739ea34de45c1454f8429ee8236eba6c927

.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.0
+    with:
+      runner: hubstaging

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-include:
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/build-template.gitlab-ci.yml"
-  - project: "devops/pena-continuous-integration"
-    file: "/templates/docker/deploy-template.gitlab-ci.yml"
-stages:
-  - build
-  - deploy
-    
-build-app:
-  tags:
-    - gobuild
-  extends: .build_template
-
-deploy-to-staging:
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $STAGING_BRANCH"
-  extends: .deploy_template
-  tags:
-    - staging
-  extends: .deploy_template
-
-deploy-to-prod:
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH"
-  tags:
-    - prod
-  extends: .deploy_template

Makefile

@@ -1,30 +0,0 @@
-GOCMD=go
-GOBUILD=$(GOCMD) build
-GOCLEAN=$(GOCMD) clean
-GOTEST=$(GOCMD) test
-RELEASE?=$(git tag)
-COMMIT?=$(shell git rev-parse --short HEAD)
-BUILD_TIME?=$(shell date -u '+%Y-%m-%d_%H:%M:%S')
-PROJECT?=bitbucket.org/skeri/heruvym
-GOOS?=linux
-GOARCH?=amd64
-BINARY_NAME=heruvym
-PORT?=1488
-
-all: build run
-clean:
-	$(GOCLEAN)
-	rm -f $(BINARY_NAME)
-build: clean
-	CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} $(GOBUILD) \
-            -ldflags "-s -w -X ${PROJECT}/version.Release=${RELEASE} \
-            -X ${PROJECT}/version.Commit=${COMMIT} -X ${PROJECT}/version.BuildTime=${BUILD_TIME}" \
-            -o ${BINARY_NAME}
-container: build
-    docker build -t $(BINARY_NAME):$(RELEASE) .
-#run: container
-#         docker stop $(BINARY_NAME):$(RELEASE) || true && docker rm $(BINARY_NAME):$(RELEASE)
-test-build:
-	CGO_ENABLED=0 $(GOTEST) -c -o ./test/test ./test
-	docker compose up --build --force-recreate --force-recreate --remove-orphans
-	docker compose down

Taskfile.dist.yml

@@ -0,0 +1,10 @@
+version: "3"
+
+tasks:
+  update-linter:
+    cmds:
+      - go get -u gitea.pena/PenaSide/linters-golang.git
+  lint:
+    cmds:
+      - task: update-linter
+      - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang.git)/.golangci.yml

cmd/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	_ "gitea.pena/PenaSide/linters-golang.git/pkg/dummy"
 	"heruvym/internal/app"
 	"heruvym/internal/initialize"
 	"log"

go.mod

@@ -2,9 +2,10 @@ module heruvym
 
 go 1.22.0
 
-toolchain go1.23.1
+toolchain go1.23.2
 
 require (
+	gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af
 	github.com/caarlos0/env/v8 v8.0.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-redis/redis/v8 v8.11.5
@@ -47,7 +48,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.6.6 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.3 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
@@ -71,3 +71,5 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+require github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -54,6 +54,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af h1:g9U+JXUI9daAZbSw+uW+5tlEdkejdRUwbJxu6FMHi24=
+gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af/go.mod h1:KOzb6hT9ASsvA6RB41GoQIwRhFr/U+f8jx3fnQsknXk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0=