From c86f88570bfd3ce702a1e0ce68eb7bcaa6e53ec7 Mon Sep 17 00:00:00 2001
From: Berger Eugene <bergere@gmail.com>
Date: Fri, 4 Oct 2024 17:56:30 +0300
Subject: [PATCH] test: added lint github action

---
 .github/workflows/go.yml        | 9 ++++++---
 golangci.yaml => .golangci.yaml | 2 +-
 Makefile                        | 2 +-
 src/loader/merger.go            | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename golangci.yaml => .golangci.yaml (99%)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2d38d382..b1f48070 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,14 +7,13 @@ on:
     branches: [ main ]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: 1.22
 
@@ -23,3 +22,7 @@ jobs:
 
     - name: Test
       run: go test -v ./src/...
+
+    - name: Run golangci-lint
+      uses: golangci/golangci-lint-action@v6
+
diff --git a/golangci.yaml b/.golangci.yaml
similarity index 99%
rename from golangci.yaml
rename to .golangci.yaml
index 91719a40..c1f4fe6d 100644
--- a/golangci.yaml
+++ b/.golangci.yaml
@@ -10,7 +10,7 @@ linters:
     - canonicalheader
 #    - containedctx
     - contextcheck
-#    - copyloopvar
+    - copyloopvar
 #    - cyclop
     - decorder
 #    - depguard
diff --git a/Makefile b/Makefile
index 3a504923..93b0e130 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ docs:
 	for f in ${DOCS_DIR}/*.md ; do sed -i 's/process-compose-[0-9]\+.sock/process-compose-<pid>.sock/g' $$f ; done
 
 lint: golangci-lint
-	./bin/golangci-lint run --show-stats -c golangci.yaml
+	./bin/golangci-lint run --show-stats -c .golangci.yaml
 
 ## Location to install dependencies to
 LOCALBIN ?= $(shell pwd)/bin
diff --git a/src/loader/merger.go b/src/loader/merger.go
index 0cc83fe2..32d6954d 100644
--- a/src/loader/merger.go
+++ b/src/loader/merger.go
@@ -125,7 +125,6 @@ func specialProcessesMerge(dst, src reflect.Value) error {
 }
 func mergeProcesses(base, override types.Processes) (types.Processes, error) {
 	for name, overrideProcess := range override {
-		overrideProcess := overrideProcess
 		if baseProcess, ok := base[name]; ok {
 			merged, err := mergeProcess(&baseProcess, &overrideProcess)
 			if err != nil {