Bump go minor version and golangci

yandex · Nov 27, 2024 · fbbf193 · fbbf193
1 parent 73ebf59
commit fbbf193
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -9,7 +9,7 @@ on:
     - cron: '30 06 * * 6'
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
 
 jobs:
   analyze:

diff --git a/.github/workflows/func-tests.yml b/.github/workflows/func-tests.yml
@@ -9,7 +9,7 @@ on:
     - cron: '30 06 * * *'
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
   DOCKER_API_VERSION: 1.43
 
 jobs:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
 
 permissions:
   contents: read
@@ -24,4 +24,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.60
+          version: v1.62
diff --git a/.github/workflows/jepsen-cluster-tests.yml b/.github/workflows/jepsen-cluster-tests.yml
@@ -5,7 +5,7 @@ on:
     - cron: '30 06 * * *'
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
 
 jobs:
   test:

diff --git a/.github/workflows/jepsen-sentinel-tests.yml b/.github/workflows/jepsen-sentinel-tests.yml
@@ -5,7 +5,7 @@ on:
     - cron: '30 06 * * *'
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
 
 jobs:
   test:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -8,7 +8,7 @@ on:
     branches: [ master ]
 
 env:
-  GO_VERSION: 1.23.2
+  GO_VERSION: 1.23.3
 
 jobs:
   unittest:

diff --git a/.golangci.yml b/.golangci.yml
@@ -40,9 +40,9 @@ linters:
   disable-all: true
   enable:
     - bodyclose
+    - copyloopvar
     - dupl
     - errcheck
-    - exportloopref
     - funlen
     - gocritic
     - gofmt
@@ -62,7 +62,7 @@ linters:
     - whitespace
 
 run:
-  go: 1.21
+  go: 1.23
   timeout: 5m
 
 severity:

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ format:
 	goimports -w `find . -name '*.go'`
 
 lint:
-	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v1.60-alpine golangci-lint run -v
+	docker run --rm -v ${CURDIR}:/app -w /app golangci/golangci-lint:v1.62-alpine golangci-lint run -v
 
 unittests:
 	go test ./cmd/... ./internal/...

diff --git a/internal/app/state.go b/internal/app/state.go
@@ -9,9 +9,9 @@ import (
 	"github.com/yandex/rdsync/internal/dcs"
 )
 
-func (app *App) setStateError(state *HostState, fqdn, error string) {
-	app.logger.Error("GetHostState error", "fqdn", fqdn, "error", error)
-	state.Error = error
+func (app *App) setStateError(state *HostState, fqdn, message string) {
+	app.logger.Error("GetHostState error", "fqdn", fqdn, "error", message)
+	state.Error = message
 }
 
 func (app *App) getHostState(fqdn string) *HostState {

diff --git a/tests/features/07_cluster_local_repair.feature b/tests/features/07_cluster_local_repair.feature
@@ -32,5 +32,5 @@ Feature: Cluster mode local node repair
         """
             redis-cli -a functestpassword DEBUG SLEEP 600
         """
-        And I wait for "300" seconds
+        And I wait for "420" seconds
         Then redis host "redis1" should become available within "60" seconds
diff --git a/tests/features/07_sentinel_local_repair.feature b/tests/features/07_sentinel_local_repair.feature
@@ -49,5 +49,5 @@ Feature: Sentinel mode local node repair
         """
             redis-cli -a functestpassword DEBUG SLEEP 600
         """
-        And I wait for "300" seconds
+        And I wait for "420" seconds
         Then redis host "redis1" should become available within "60" seconds
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         - cron: '30 06 * * *'
     env:
-      GO_VERSION: 1.23.2
+      GO_VERSION: 1.23.3
     jobs:
       test:
@@ Expand Down @@