From 9494d8498a2bb66a575fc7f1e96070c4788a3cf9 Mon Sep 17 00:00:00 2001 From: Nedyalko Dyakov Date: Tue, 18 Mar 2025 14:20:18 +0200 Subject: [PATCH] chore: use redis 8 ce m05 (#3304) * use m05 * add platform, since client-libs has image for amd64 * verbose testing * Update .github/workflows/build.yml --- .github/actions/run-tests/action.yml | 2 +- .github/workflows/build.yml | 6 +++--- Makefile | 2 +- docker-compose.yml | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index a1b96d88..def48baf 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -25,7 +25,7 @@ runs: # Mapping of redis version to redis testing containers declare -A redis_version_mapping=( - ["8.0-M03"]="8.0-M04-pre" + ["8.0-M05"]="8.0-M05-pre" ["7.4.2"]="rs-7.4.0-v2" ["7.2.7"]="rs-7.2.0-v14" ) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 592e4876..48bbdb75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: redis-version: - - "8.0-M03" # 8.0 milestone 4 + - "8.0-M05" # 8.0 milestone 5 - "7.4.2" # should use redis stack 7.4 go-version: - "1.23.x" @@ -43,7 +43,7 @@ jobs: # Mapping of redis version to redis testing containers declare -A redis_version_mapping=( - ["8.0-M03"]="8.0-M04-pre" + ["8.0-M05"]="8.0-M05-pre" ["7.4.2"]="rs-7.4.0-v2" ) if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then @@ -72,7 +72,7 @@ jobs: fail-fast: false matrix: redis-version: - - "8.0-M03" # 8.0 milestone 4 + - "8.0-M05" # 8.0 milestone 5 - "7.4.2" # should use redis stack 7.4 - "7.2.7" # should redis stack 7.2 go-version: diff --git a/Makefile b/Makefile index d94676ad..fc175f5f 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test.ci: (cd "$${dir}" && \ go mod tidy -compat=1.18 && \ go vet && \ - go test -coverprofile=coverage.txt -covermode=atomic ./... -race); \ + go test -v -coverprofile=coverage.txt -covermode=atomic ./... -race); \ done cd internal/customvet && go build . go vet -vettool ./internal/customvet/customvet diff --git a/docker-compose.yml b/docker-compose.yml index 5bf69f19..3d4347bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ services: redis: image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2} + platform: linux/amd64 container_name: redis-standalone environment: - TLS_ENABLED=yes @@ -23,6 +24,7 @@ services: osscluster: image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2} + platform: linux/amd64 container_name: redis-osscluster environment: - NODES=6 @@ -39,6 +41,7 @@ services: sentinel-cluster: image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2} + platform: linux/amd64 container_name: redis-sentinel-cluster network_mode: "host" environment: @@ -58,6 +61,7 @@ services: sentinel: image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2} + platform: linux/amd64 container_name: redis-sentinel depends_on: - sentinel-cluster @@ -81,6 +85,7 @@ services: ring-cluster: image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2} + platform: linux/amd64 container_name: redis-ring-cluster environment: - NODES=3