test: added lint github action

F1bonacc1 · Oct 4, 2024 · c86f885 · c86f885
1 parent 663b8d0
commit c86f885
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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 → .golangci.yaml b/golangci.yaml → .golangci.yaml
@@ -10,7 +10,7 @@ linters:
     - canonicalheader
 #    - containedctx
     - contextcheck
-#    - copyloopvar
+    - copyloopvar
 #    - cyclop
     - decorder
 #    - depguard

diff --git 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
@@ -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 {