From 2cc40f9b7570c87493b61cd86dd0f02d2b6cdf84 Mon Sep 17 00:00:00 2001
From: Martin Stiemerling <martin.stiemerling@h-da.de>
Date: Mon, 28 Oct 2024 13:33:14 +0000
Subject: [PATCH] Linter upgrade fixes

---
 .gitlab-ci.yml | 4 ++--
 .golangci.yml  | 6 +++---
 Makefile       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4abe01c..8cad74b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 
 variables:
   IMAGE_PATH: "${CI_REGISTRY_IMAGE}"
-  GOLANG_VERSION: "1.22"
+  GOLANG_VERSION: "1.23"
 
 .build: &build
     stage: build
@@ -38,7 +38,7 @@ build-gnmi-target-debian:
     <<: *build
 
 code-quality:
-    image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.59.1-alpine
+    image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.61.0-alpine
     stage: analyze
     script:
         # writes golangci-lint output to gl-code-quality-report.json
diff --git a/.golangci.yml b/.golangci.yml
index 8d4b939..e879bd7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,7 @@
 variables:
-    GOLANG_VERSION: "1.22"
+    GOLANG_VERSION: "1.23"
 run:
-    go: $GOLANG_VERSION
+    go-version: $GOLANG_VERSION
     concurrency: 8
     timeout: 20m
     issues-exit-code: 1
@@ -51,7 +51,7 @@ linters:
         - bidichk
         - durationcheck
         - errorlint
-        - exportloopref
+        - copyloopvar
         - grouper
         - makezero
         - misspell
diff --git a/Makefile b/Makefile
index 68ad35f..bc0673b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ GOSDN_PRG := $(MAKEFILE_DIR)$(TOOLS_DIR)
 GOPATH := $(~/go)
 GOBIN := $(GOSDN_PRG)
 
-GOLANGCI_LINT_VERSION=v1.59.0
+GOLANGCI_LINT_VERSION=v1.61.0
 
 GOCMD=go
 GOBUILD=$(GOCMD) build
-- 
GitLab