diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d35849a29..2c7b3b6b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ permissions: contents: read env: - GOLANGCI_LINT_VERSION: 'v2.2.1' + GOLANGCI_LINT_VERSION: 'v2.10.1' NFPM_VERSION: 'v2.35.3' NGINX_OSS_REGISTRY: 'docker-registry.nginx.com' diff --git a/Makefile.tools b/Makefile.tools index 8468140c8..ba65b6cb2 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -6,7 +6,7 @@ LEFTHOOK = "github.com/evilmartians/lefthook@v1.5.5" GO_SWAGGER = "github.com/go-swagger/go-swagger/cmd/swagger@abb53530bfcf49c470e5f4c7071ee43f37ec7437" # v0.30.5 currently broken. Update expected shortly. Ref: https://github.com/go-swagger/go-swagger/issues/3070 PROTOBUF = "github.com/gogo/protobuf/protoc-gen-gogo@v1.3.2" GOGOFAST = "github.com/gogo/protobuf/protoc-gen-gogofast@v1.3.2" -GOLANGCI_LINT = "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0" +GOLANGCI_LINT = "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.10.0" PROTOC_GENGO = "google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0" PROTOC_VALIDATORS = "github.com/mwitkow/go-proto-validators/protoc-gen-govalidators@v0.3.2" PROTOC_GEN_DOC = "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.5.1" diff --git a/go.mod b/go.mod index 3e4a03e32..90b9a6592 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/nginx/agent/v2 -go 1.24.2 +go 1.25 -toolchain go1.24.13 +toolchain go1.25.7 require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect diff --git a/go.work b/go.work index 38c2beecb..1f4820fbf 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,6 @@ -go 1.24.2 +go 1.25.7 -toolchain go1.24.13 +toolchain go1.25.7 use ( . diff --git a/sdk/go.mod b/sdk/go.mod index 497c841a9..7b51cb280 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,8 +1,8 @@ module github.com/nginx/agent/sdk/v2 -go 1.24.2 +go 1.25 -toolchain go1.24.13 +toolchain go1.25.7 require ( github.com/cenkalti/backoff/v4 v4.2.1 diff --git a/test/integration/go.mod b/test/integration/go.mod index bf4bee111..e2198e8ee 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -1,8 +1,8 @@ module github.com/nginx/agent/test/integration -go 1.24.2 +go 1.25 -toolchain go1.24.13 +toolchain go1.25.7 require ( github.com/docker/docker v28.0.1+incompatible diff --git a/test/integration/vendor/modules.txt b/test/integration/vendor/modules.txt index c78d95004..7e58981fa 100644 --- a/test/integration/vendor/modules.txt +++ b/test/integration/vendor/modules.txt @@ -178,7 +178,7 @@ github.com/moby/term/windows ## explicit github.com/morikuni/aec # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./../../sdk -## explicit; go 1.24.2 +## explicit; go 1.25 github.com/nginx/agent/sdk/v2 github.com/nginx/agent/sdk/v2/agent/config github.com/nginx/agent/sdk/v2/agent/events @@ -193,7 +193,7 @@ github.com/nginx/agent/sdk/v2/proto/common github.com/nginx/agent/sdk/v2/proto/events github.com/nginx/agent/sdk/v2/zip # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => ./../../ -## explicit; go 1.24.2 +## explicit; go 1.25 github.com/nginx/agent/v2/src/core github.com/nginx/agent/v2/src/core/config github.com/nginx/agent/v2/src/core/network diff --git a/test/performance/go.mod b/test/performance/go.mod index e8668c664..d898ed7d4 100644 --- a/test/performance/go.mod +++ b/test/performance/go.mod @@ -1,8 +1,8 @@ module github.com/nginx/agent/test/performance -go 1.24.2 +go 1.25 -toolchain go1.24.13 +toolchain go1.25.7 require ( github.com/gogo/protobuf v1.3.2 diff --git a/test/performance/vendor/modules.txt b/test/performance/vendor/modules.txt index 3f24cd639..462512c23 100644 --- a/test/performance/vendor/modules.txt +++ b/test/performance/vendor/modules.txt @@ -119,7 +119,7 @@ github.com/nats-io/nkeys ## explicit github.com/nats-io/nuid # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./../../sdk -## explicit; go 1.24.2 +## explicit; go 1.25 github.com/nginx/agent/sdk/v2 github.com/nginx/agent/sdk/v2/agent/config github.com/nginx/agent/sdk/v2/agent/events @@ -134,7 +134,7 @@ github.com/nginx/agent/sdk/v2/proto/common github.com/nginx/agent/sdk/v2/proto/events github.com/nginx/agent/sdk/v2/zip # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => ./../../ -## explicit; go 1.24.2 +## explicit; go 1.25 github.com/nginx/agent/v2/src/core github.com/nginx/agent/v2/src/core/config github.com/nginx/agent/v2/src/core/logger diff --git a/vendor/modules.txt b/vendor/modules.txt index 9d8bcb878..78e17c862 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -240,9 +240,9 @@ github.com/nats-io/nkeys ## explicit github.com/nats-io/nuid # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./sdk -## explicit; go 1.24.2 +## explicit; go 1.25 # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => . -## explicit; go 1.24.2 +## explicit; go 1.25 # github.com/nginx/nginx-plus-go-client/v3 v3.0.1 ## explicit; go 1.24.2 github.com/nginx/nginx-plus-go-client/v3/client