mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into os-add-coverage-ci

This commit is contained in:
ofekshenawa 2024-09-03 14:13:14 +03:00 committed by GitHub
parent 39c9610d37 00d98485f8
commit c6ddeb540a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
services: services:
redis: redis:
image: redis/redis-stack-server:edge image: redis/redis-stack-server:latest
options: >- options: >-
--health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5 --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
ports: ports:

2
.github/workflows/spellcheck.yml vendored
View File

@ -8,7 +8,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Check Spelling - name: Check Spelling
uses: rojopolis/spellcheck-github-actions@0.38.0 uses: rojopolis/spellcheck-github-actions@0.40.0
with: with:
config_path: .github/spellcheck-settings.yml config_path: .github/spellcheck-settings.yml
task_name: Markdown task_name: Markdown

2
example/del-keys-without-ttl/go.mod
View File

@ -5,7 +5,7 @@ go 1.18
replace github.com/redis/go-redis/v9 => ../.. replace github.com/redis/go-redis/v9 => ../..
require ( require (
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
go.uber.org/zap v1.24.0 go.uber.org/zap v1.24.0
) )

2
example/hll/go.mod
View File

@ -4,7 +4,7 @@ go 1.18
replace github.com/redis/go-redis/v9 => ../.. replace github.com/redis/go-redis/v9 => ../..
require github.com/redis/go-redis/v9 v9.5.3 require github.com/redis/go-redis/v9 v9.6.1
require ( require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect

2
example/lua-scripting/go.mod
View File

@ -4,7 +4,7 @@ go 1.18
replace github.com/redis/go-redis/v9 => ../.. replace github.com/redis/go-redis/v9 => ../..
require github.com/redis/go-redis/v9 v9.5.3 require github.com/redis/go-redis/v9 v9.6.1
require ( require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect

6
example/otel/go.mod
View File

@ -9,8 +9,8 @@ replace github.com/redis/go-redis/extra/redisotel/v9 => ../../extra/redisotel
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../../extra/rediscmd replace github.com/redis/go-redis/extra/rediscmd/v9 => ../../extra/rediscmd
require ( require (
github.com/redis/go-redis/extra/redisotel/v9 v9.5.3 github.com/redis/go-redis/extra/redisotel/v9 v9.6.1
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
github.com/uptrace/uptrace-go v1.21.0 github.com/uptrace/uptrace-go v1.21.0
go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel v1.22.0
) )
@ -23,7 +23,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 // indirect github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/runtime v0.46.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect

2
example/redis-bloom/go.mod
View File

@ -4,7 +4,7 @@ go 1.18
replace github.com/redis/go-redis/v9 => ../.. replace github.com/redis/go-redis/v9 => ../..
require github.com/redis/go-redis/v9 v9.5.3 require github.com/redis/go-redis/v9 v9.6.1
require ( require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect

2
example/scan-struct/go.mod
View File

@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
require ( require (
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
) )
require ( require (

4
extra/rediscensus/go.mod
View File

@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
require ( require (
github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
go.opencensus.io v0.24.0 go.opencensus.io v0.24.0
) )

2
extra/rediscmd/go.mod
View File

@ -7,7 +7,7 @@ replace github.com/redis/go-redis/v9 => ../..
require ( require (
github.com/bsm/ginkgo/v2 v2.12.0 github.com/bsm/ginkgo/v2 v2.12.0
github.com/bsm/gomega v1.27.10 github.com/bsm/gomega v1.27.10
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
) )
require ( require (

4
extra/redisotel/go.mod
View File

@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
require ( require (
github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel v1.22.0
go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/metric v1.22.0
go.opentelemetry.io/otel/sdk v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0

2
extra/redisprometheus/go.mod
View File

@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
require ( require (
github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_golang v1.14.0
github.com/redis/go-redis/v9 v9.5.3 github.com/redis/go-redis/v9 v9.6.1
) )
require ( require (

5
go.mod
View File

@ -8,3 +8,8 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 github.com/cespare/xxhash/v2 v2.2.0
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f
) )
retract (
v9.5.3 // This version was accidentally released. Please use version 9.6.0 instead.
v9.5.4 // This version was accidentally released. Please use version 9.6.0 instead.
)

2
version.go
View File

@ -2,5 +2,5 @@ package redis
// Version is the current release version. // Version is the current release version.
func Version() string { func Version() string {
return "9.5.3" return "9.6.1"
} }