diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4ceb6bb..4a6a2a7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -9,7 +9,7 @@ on: - cron: '30 06 * * 6' env: - GO_VERSION: 1.25.7 + GO_VERSION: 1.26.0 jobs: analyze: diff --git a/.github/workflows/func-tests.yml b/.github/workflows/func-tests.yml index 8579bb7..e2ee80e 100644 --- a/.github/workflows/func-tests.yml +++ b/.github/workflows/func-tests.yml @@ -9,7 +9,7 @@ on: - cron: '30 06 * * *' env: - GO_VERSION: 1.25.7 + GO_VERSION: 1.26.0 GOEXPERIMENT: jsonv2 DOCKER_API_VERSION: 1.45 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 1f41444..95ce02e 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -7,7 +7,7 @@ on: branches: [ master ] env: - GO_VERSION: 1.25.7 + GO_VERSION: 1.26.0 GOEXPERIMENT: jsonv2 permissions: @@ -25,4 +25,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v9.2.0 with: - version: v2.6 + version: v2.9 diff --git a/.github/workflows/jepsen-cluster-tests.yml b/.github/workflows/jepsen-cluster-tests.yml index 781f70b..3a07606 100644 --- 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.25.7 + GO_VERSION: 1.26.0 GOEXPERIMENT: jsonv2 jobs: diff --git a/.github/workflows/jepsen-sentinel-tests.yml b/.github/workflows/jepsen-sentinel-tests.yml index 3b85dd8..2991c89 100644 --- 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.25.7 + GO_VERSION: 1.26.0 GOEXPERIMENT: jsonv2 jobs: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1634e26..bfbd3d0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -8,7 +8,7 @@ on: branches: [ master ] env: - GO_VERSION: 1.25.7 + GO_VERSION: 1.26.0 GOEXPERIMENT: jsonv2 jobs: diff --git a/Makefile b/Makefile index 3f74e34..57af6f4 100644 --- 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:v2.6-alpine golangci-lint run -v + docker run --rm --env GOEXPERIMENT=jsonv2 -v ${CURDIR}:/app -w /app golangci/golangci-lint:v2.9-alpine golangci-lint run -v unittests: go test ./cmd/... ./internal/... diff --git a/README.md b/README.md index af3749f..0060c79 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ It uses a patched valkey version to make a cluster or sentinel-like setup less p ## Try it out -* You will need a linux vm with gnu make, docker, docker compose and go >=1.25 installed. +* You will need a linux vm with gnu make, docker, docker compose and go >=1.26 installed. * Use `make start_sentinel_env` to start an environment with senticache * Or `make start_cluster_env` to start an environment with single shard of clustered setup * Run `make clean` to drop containers and network diff --git a/go.mod b/go.mod index 6d85a75..1926d91 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/yandex/rdsync -go 1.25.0 - -toolchain go1.25.7 +go 1.26.0 require ( github.com/cenkalti/backoff/v4 v4.3.0 @@ -54,7 +52,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.40.0 // indirect go.opentelemetry.io/otel/trace v1.40.0 // indirect - golang.org/x/sys v0.40.0 // indirect + golang.org/x/sys v0.41.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 89b496b..bc2cc99 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=