V9.7.1 -> master (#3287)

ndyakov · web-flow · commit aa7019d71847 · 2025-02-24T12:45:08.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Go
 
 on:
   push:
-    branches: [master, v9]
+    branches: [master, v9, v9.7]
   pull_request:
-    branches: [master, v9]
+    branches: [master, v9, v9.7]
 
 permissions:
   contents: read
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -12,15 +12,13 @@ on:
 
 permissions:
   contents: read
+  pull-requests: read  # for golangci/golangci-lint-action to fetch pull requests
 
 jobs:
   golangci:
-    permissions:
-      contents: read  # for actions/checkout to fetch code
-      pull-requests: read  # for golangci/golangci-lint-action to fetch pull requests
     name: lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v6.5.0
diff --git a/example/del-keys-without-ttl/go.mod b/example/del-keys-without-ttl/go.mod
@@ -5,7 +5,7 @@ go 1.18
 replace github.com/redis/go-redis/v9 => ../..
 
 require (
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.1
 	go.uber.org/zap v1.24.0
 )
 
diff --git a/example/hll/go.mod b/example/hll/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.6.2
+require github.com/redis/go-redis/v9 v9.7.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
diff --git a/example/lua-scripting/go.mod b/example/lua-scripting/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.6.2
+require github.com/redis/go-redis/v9 v9.7.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
diff --git a/example/otel/go.mod b/example/otel/go.mod
@@ -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
 
 require (
-	github.com/redis/go-redis/extra/redisotel/v9 v9.6.2
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/extra/redisotel/v9 v9.7.1
+	github.com/redis/go-redis/v9 v9.7.1
 	github.com/uptrace/uptrace-go v1.21.0
 	go.opentelemetry.io/otel v1.22.0
 )
@@ -23,7 +23,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2 // indirect
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.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/otlptrace v1.21.0 // indirect
diff --git a/example/redis-bloom/go.mod b/example/redis-bloom/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.6.2
+require github.com/redis/go-redis/v9 v9.7.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
diff --git a/example/scan-struct/go.mod b/example/scan-struct/go.mod
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.1
 )
 
 require (
diff --git a/extra/rediscensus/go.mod b/extra/rediscensus/go.mod
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
 replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
 
 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.1
+	github.com/redis/go-redis/v9 v9.7.1
 	go.opencensus.io v0.24.0
 )
 
diff --git a/extra/rediscmd/go.mod b/extra/rediscmd/go.mod
@@ -7,7 +7,7 @@ replace github.com/redis/go-redis/v9 => ../..
 require (
 	github.com/bsm/ginkgo/v2 v2.12.0
 	github.com/bsm/gomega v1.27.10
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.1
 )
 
 require (
diff --git a/extra/redisotel/go.mod b/extra/redisotel/go.mod
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
 replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
 
 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.1
+	github.com/redis/go-redis/v9 v9.7.1
 	go.opentelemetry.io/otel v1.22.0
 	go.opentelemetry.io/otel/metric v1.22.0
 	go.opentelemetry.io/otel/sdk v1.22.0
diff --git a/extra/redisprometheus/go.mod b/extra/redisprometheus/go.mod
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
 
 require (
 	github.com/prometheus/client_golang v1.14.0
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.1
 )
 
 require (
diff --git a/search_test.go b/search_test.go
@@ -667,7 +667,6 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 	})
 
 	It("should FTAggregate with scorer and addscores", Label("search", "ftaggregate", "NonRedisEnterprise"), func() {
-		SkipBeforeRedisMajor(8, "ADDSCORES is available in Redis CE 8")
 		title := &redis.FieldSchema{FieldName: "title", FieldType: redis.SearchFieldTypeText, Sortable: false}
 		description := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText, Sortable: false}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{OnHash: true, Prefix: []interface{}{"product:"}}, title, description).Result()
diff --git a/version.go b/version.go
@@ -2,5 +2,5 @@ package redis
 
 // Version is the current release version.
 func Version() string {
-	return "9.6.2"
+	return "9.7.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.18`
`5`	`5`	`replace github.com/redis/go-redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`		`- github.com/redis/go-redis/v9 v9.6.2`
	`8`	`+ github.com/redis/go-redis/v9 v9.7.1`
`9`	`9`	`go.uber.org/zap v1.24.0`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`github.com/davecgh/go-spew v1.1.1`
`9`		`- github.com/redis/go-redis/v9 v9.6.2`
	`9`	`+ github.com/redis/go-redis/v9 v9.7.1`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..`
`7`	`7`	`replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd`
`8`	`8`
`9`	`9`	`require (`
`10`		`- github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2`
`11`		`- github.com/redis/go-redis/v9 v9.6.2`
	`10`	`+ github.com/redis/go-redis/extra/rediscmd/v9 v9.7.1`
	`11`	`+ github.com/redis/go-redis/v9 v9.7.1`
`12`	`12`	`go.opencensus.io v0.24.0`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ replace github.com/redis/go-redis/v9 => ../..`
`7`	`7`	`require (`
`8`	`8`	`github.com/bsm/ginkgo/v2 v2.12.0`
`9`	`9`	`github.com/bsm/gomega v1.27.10`
`10`		`- github.com/redis/go-redis/v9 v9.6.2`
	`10`	`+ github.com/redis/go-redis/v9 v9.7.1`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`github.com/prometheus/client_golang v1.14.0`
`9`		`- github.com/redis/go-redis/v9 v9.6.2`
	`9`	`+ github.com/redis/go-redis/v9 v9.7.1`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ package redis`
`2`	`2`
`3`	`3`	`// Version is the current release version.`
`4`	`4`	`func Version() string {`
`5`		`- return "9.6.2"`
	`5`	`+ return "9.7.1"`
`6`	`6`	`}`