From 52e8e34e263590a618915f7091319d252cfd4759 Mon Sep 17 00:00:00 2001 From: Nedyalko Dyakov Date: Tue, 18 Mar 2025 11:09:29 +0200 Subject: [PATCH 1/4] use m05 --- .github/actions/run-tests/action.yml | 2 +- .github/workflows/build.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index a1b96d88b..def48baf8 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 592e48764..535d81e9f 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 4 - "7.4.2" # should use redis stack 7.4 - "7.2.7" # should redis stack 7.2 go-version: From 4d68a6c17f71f6f568f03da27775ecc126c15e71 Mon Sep 17 00:00:00 2001 From: Nedyalko Dyakov Date: Tue, 18 Mar 2025 11:29:56 +0200 Subject: [PATCH 2/4] add platform, since client-libs has image for amd64 --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5bf69f19d..3d4347bf2 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 From ffc5c14496aa2d25c7a492260897fb14fb75c6bb Mon Sep 17 00:00:00 2001 From: Nedyalko Dyakov Date: Tue, 18 Mar 2025 11:30:05 +0200 Subject: [PATCH 3/4] verbose testing --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d94676ad4..fc175f5f1 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 From b99217e30befba063ee1a751a77cfd90bca143d9 Mon Sep 17 00:00:00 2001 From: Nedyalko Dyakov Date: Tue, 18 Mar 2025 13:21:55 +0200 Subject: [PATCH 4/4] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 535d81e9f..48bbdb751 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: fail-fast: false matrix: redis-version: - - "8.0-M05" # 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: