redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-06-06 17:40:59 +03:00
Code

chore(ci): Use redis 8 rc2 image. (#3361)

Browse Source 
* chore(ci): Use redis 8 rc2 image

* test(timeseries): fix duplicatePolicy check
This commit is contained in:
Nedyalko Dyakov 2025-04-29 13:08:34 +03:00 committed by GitHub
parent 2f0a9b720a
commit 683f644ec2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/run-tests/action.yml vendored
View File

@ -25,7 +25,7 @@ runs:
# Mapping of redis version to redis testing containers # Mapping of redis version to redis testing containers
declare -A redis_version_mapping=( declare -A redis_version_mapping=(
["8.0-RC1"]="8.0-RC1-pre" ["8.0-RC2"]="8.0-RC2-pre"
["7.4.2"]="rs-7.4.0-v2" ["7.4.2"]="rs-7.4.0-v2"
["7.2.7"]="rs-7.2.0-v14" ["7.2.7"]="rs-7.2.0-v14"
) )

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

@ -18,7 +18,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
redis-version: redis-version:
- "8.0-RC1" # 8.0 RC1 - "8.0-RC2" # 8.0 RC2
- "7.4.2" # should use redis stack 7.4 - "7.4.2" # should use redis stack 7.4
go-version: go-version:
- "1.23.x" - "1.23.x"
@ -43,7 +43,7 @@ jobs:
# Mapping of redis version to redis testing containers # Mapping of redis version to redis testing containers
declare -A redis_version_mapping=( declare -A redis_version_mapping=(
["8.0-RC1"]="8.0-RC1-pre" ["8.0-RC2"]="8.0-RC2-pre"
["7.4.2"]="rs-7.4.0-v2" ["7.4.2"]="rs-7.4.0-v2"
) )
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
@ -72,7 +72,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
redis-version: redis-version:
- "8.0-RC1" # 8.0 RC1 - "8.0-RC2" # 8.0 RC2
- "7.4.2" # should use redis stack 7.4 - "7.4.2" # should use redis stack 7.4
- "7.2.7" # should redis stack 7.2 - "7.2.7" # should redis stack 7.2
go-version: go-version:

10
timeseries_commands_test.go
View File

@ -269,12 +269,22 @@ var _ = Describe("RedisTimeseries commands", Label("timeseries"), func() {
if client.Options().Protocol == 2 { if client.Options().Protocol == 2 {
Expect(resultInfo["labels"].([]interface{})[0]).To(BeEquivalentTo([]interface{}{"Time", "Series"})) Expect(resultInfo["labels"].([]interface{})[0]).To(BeEquivalentTo([]interface{}{"Time", "Series"}))
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10)) Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
if RedisVersion >= 8 {
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo("block"))
} else {
// Older versions of Redis had a bug where the duplicate policy was not set correctly
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil)) Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
}
} else { } else {
Expect(resultInfo["labels"].(map[interface{}]interface{})["Time"]).To(BeEquivalentTo("Series")) Expect(resultInfo["labels"].(map[interface{}]interface{})["Time"]).To(BeEquivalentTo("Series"))
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10)) Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
if RedisVersion >= 8 {
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo("block"))
} else {
// Older versions of Redis had a bug where the duplicate policy was not set correctly
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil)) Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
} }
}
opt = &redis.TSAlterOptions{DuplicatePolicy: "min"} opt = &redis.TSAlterOptions{DuplicatePolicy: "min"}
resultAlter, err = client.TSAlter(ctx, "1", opt).Result() resultAlter, err = client.TSAlter(ctx, "1", opt).Result()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())