From f2aa75a29ec2d5d08d353993934a7801b2543580 Mon Sep 17 00:00:00 2001
From: Peter Matseykanets <peter.matseykanets@suse.com>
Date: Wed, 7 Jan 2026 13:38:59 -0500
Subject: [PATCH] [v2.13] Bump Go toolchain to 1.24.11 (#524)

* Bump Go toolchain to 1.24.11
* Migrate golangci-lint to v2
* Pin github actions' versions
---
 .github/workflows/ci.yml | 10 ++++++----
 .golangci.json           | 22 ++++++++++++++--------
 go.mod                   |  2 +-
 scripts/ci               |  1 -
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec694143..eb0715b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,16 +12,18 @@ jobs:
 
     steps:
     - name: Checkout Repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
       with:
         go-version-file: go.mod
         cache: false
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v4
+      uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+      with:
+        version: v2.7.1
 
     - name: Validate Go modules
       run: ./scripts/validate
@@ -51,7 +53,7 @@ jobs:
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
     - name: Docker Build
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
       with:
         push: false
         context: package
diff --git a/.golangci.json b/.golangci.json
index 0c2977c8..cbf2f9b1 100644
--- a/.golangci.json
+++ b/.golangci.json
@@ -1,10 +1,16 @@
 {
-    "linters": {
-        "enable": [
-            "gofmt"
-        ]
-    },
-    "run": {
-        "timeout": "10m"
-    }
+  "formatters": {
+    "enable": [
+      "gofmt"
+    ]
+  },
+  "linters": {
+    "default": "none",
+    "enable": [
+      "govet",
+      "ineffassign",
+      "unused"
+    ]
+  },
+  "version": "2"
 }
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 096b129e..209ff777 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/rancher/cli
 
 go 1.24.0
 
-toolchain go1.24.9
+toolchain go1.24.11
 
 replace (
 	k8s.io/apiserver => k8s.io/apiserver v0.34.2
diff --git a/scripts/ci b/scripts/ci
index 608fddf1..e6fae796 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -5,6 +5,5 @@ cd $(dirname $0)
 
 ./build
 ./test
-./lint
 ./validate
 ./package