Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8fb31f
chore(ci): Use redis 8 rc2 image
ndyakov Apr 28, 2025
68b4407
test(timeseries): fix duplicatePolicy check
ndyakov Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/run-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:

# Mapping of redis version to redis testing containers
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.2.7"]="rs-7.2.0-v14"
)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
redis-version:
- "8.0-RC1" # 8.0 RC1
- "8.0-RC2" # 8.0 RC2
- "7.4.2" # should use redis stack 7.4
go-version:
- "1.23.x"
Expand All @@ -43,7 +43,7 @@ jobs:

# Mapping of redis version to redis testing containers
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"
)
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
fail-fast: false
matrix:
redis-version:
- "8.0-RC1" # 8.0 RC1
- "8.0-RC2" # 8.0 RC2
- "7.4.2" # should use redis stack 7.4
- "7.2.7" # should redis stack 7.2
go-version:
Expand Down
14 changes: 12 additions & 2 deletions timeseries_commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,21 @@ var _ = Describe("RedisTimeseries commands", Label("timeseries"), func() {
if client.Options().Protocol == 2 {
Expect(resultInfo["labels"].([]interface{})[0]).To(BeEquivalentTo([]interface{}{"Time", "Series"}))
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
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))
}
} else {
Expect(resultInfo["labels"].(map[interface{}]interface{})["Time"]).To(BeEquivalentTo("Series"))
Expect(resultInfo["retentionTime"]).To(BeEquivalentTo(10))
Expect(resultInfo["duplicatePolicy"]).To(BeEquivalentTo(redis.Nil))
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))
}
}
opt = &redis.TSAlterOptions{DuplicatePolicy: "min"}
resultAlter, err = client.TSAlter(ctx, "1", opt).Result()
Expand Down
Loading