From 1811e22d167f811dbf50f41ab9ebdd56390a158d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=91=D0=B0?=
 =?UTF-8?q?=D0=B4=D1=8F=D0=B5=D0=B2?= <aleksei.badiaev@mousesoft.ru>
Date: Thu, 17 Oct 2024 23:43:11 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=20wo?=
 =?UTF-8?q?rkflow.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build.yaml         | 17 +++++++++++++++--
 .gitea/workflows/golangci-lint.yaml | 22 ----------------------
 .vscode/settings.json               |  1 +
 README.md                           |  3 +++
 cmd/drawio-export/main.go           |  4 ++--
 cmd/drawio-export/options.go        |  2 +-
 makefile                            |  1 +
 7 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 .gitea/workflows/golangci-lint.yaml

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index c24316b..adb123b 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -25,10 +25,15 @@ jobs:
           go-version: ">=1.22"
 
       - name: set-up dependencies
-        run: make clean vendor
+        run: |
+          go install github.com/kisielk/errcheck@latest
+          go install honnef.co/go/tools/cmd/staticcheck@latest
+          go install github.com/sashamelentyev/usestdlibvars@latest
+          go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest
+          make vendor
 
       - name: test
-        run: make lint test
+        run: make test
 
       - name: build amd64 binary
         id: build-amd
@@ -56,6 +61,14 @@ jobs:
           path: out/bin/*
           overwrite: true
 
+      - name: lint
+        run: make lint
+
+      - name: golangci-lint
+        uses: https://github.com/golangci/golangci-lint-action@v6
+        with:
+          version: v1.60
+
   build_windows:
     runs-on: windows
     defaults:
diff --git a/.gitea/workflows/golangci-lint.yaml b/.gitea/workflows/golangci-lint.yaml
deleted file mode 100644
index a767b2d..0000000
--- a/.gitea/workflows/golangci-lint.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: golangci-lint
-on: push
-
-jobs:
-  lint:
-    strategy:
-      matrix:
-        go: [stable]
-        os: [ubuntu-latest, windows-latest]
-    name: lint
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: check-out
-        uses: https://gitea.com/actions/checkout@v4
-      - name: set-up go
-        uses: https://gitea.com/actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go }}
-      - name: lint
-        uses: https://github.com/golangci/golangci-lint-action@v6
-        with:
-          version: v1.60
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c6d8392..cdc1c0e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,6 +15,7 @@
         "geekyeggo",
         "gitea",
         "gocov",
+        "golangci",
         "GOPATH",
         "honnef",
         "INSTALLDIR",
diff --git a/README.md b/README.md
index 0f55fd9..9afc232 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@
   Команда установки линтера: `go install honnef.co/go/tools/cmd/staticcheck@latest`.
 - [usestdlibvars](https://github.com/sashamelentyev/usestdlibvars)  
   Команда установки линтера: `go install github.com/sashamelentyev/usestdlibvars@latest`
+- [shadow](https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/shadow)
+  Команда установки линтера:
+  `go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest`.
 
 Все линтеры проекта можно запустить командой:
 
diff --git a/cmd/drawio-export/main.go b/cmd/drawio-export/main.go
index d939e3b..20b059e 100644
--- a/cmd/drawio-export/main.go
+++ b/cmd/drawio-export/main.go
@@ -13,7 +13,7 @@ var (
 	version string // Версия приложения
 )
 
-type flags struct {
+type appFlags struct {
 	flagHelp         bool // Вывести справку о приложении и выйти
 	flagVersion      bool // Вывести информацию о версии приложения и выйти
 	flagIgnoreErrors bool // Игнорировать ошибки
@@ -22,7 +22,7 @@ type flags struct {
 func main() {
 	var (
 		opts  drawio.Options // Аргументы командной строки приложения
-		flags flags          // Флаги командной строки
+		flags appFlags       // Флаги командной строки
 	)
 
 	initFlags(&opts, &flags)
diff --git a/cmd/drawio-export/options.go b/cmd/drawio-export/options.go
index 7da685f..df90423 100644
--- a/cmd/drawio-export/options.go
+++ b/cmd/drawio-export/options.go
@@ -6,7 +6,7 @@ import (
 	"git.mousesoft.ru/ms/drawio-export/pkg/drawio"
 )
 
-func initFlags(opts *drawio.Options, flags *flags) {
+func initFlags(opts *drawio.Options, flags *appFlags) {
 	// Version
 	flag.BoolVar(&flags.flagVersion, "V", false, "Prints version information")
 	flag.BoolVar(&flags.flagVersion, "version", false, "Prints version information")
diff --git a/makefile b/makefile
index 23d93a5..f250699 100644
--- a/makefile
+++ b/makefile
@@ -199,6 +199,7 @@ lint: ## Run all available linters.
 	errcheck ./...
 	staticcheck ./...
 	usestdlibvars ./...
+	shadow ./...
 	@$(ECHO_CMD) "Lint\t\t${GREEN}[OK]${RESET}"
 .PHONY:lint