From c59434534a3d0e3b15a885b32f96174e9bda9630 Mon Sep 17 00:00:00 2001
From: ggivo <ivo.gaydazhiev@redis.com>
Date: Thu, 3 Jul 2025 16:45:49 +0300
Subject: [PATCH] Add 8.2 to test matrix

---
 .github/workflows/test-on-docker.yml | 1 +
 Makefile                             | 6 +++---
 src/test/resources/env/.env          | 4 ++--
 src/test/resources/env/.env.v8.0     | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 src/test/resources/env/.env.v8.0

diff --git a/.github/workflows/test-on-docker.yml b/.github/workflows/test-on-docker.yml
index de4dc71d06..5c47c86dbb 100644
--- a/.github/workflows/test-on-docker.yml
+++ b/.github/workflows/test-on-docker.yml
@@ -36,6 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
+          - "8.2"
           - "8.0"
           - "7.4"
           - "7.2"
diff --git a/Makefile b/Makefile
index 2c9bfa1cf7..cf634e015a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 PATH := ./redis-git/src:${PATH}
 
 # Supported test env versions
-SUPPORTED_TEST_ENV_VERSIONS := 8.0 7.4 7.2 6.2
-DEFAULT_TEST_ENV_VERSION := 8.0
+SUPPORTED_TEST_ENV_VERSIONS := 8.2 8.0 7.4 7.2 6.2
+DEFAULT_TEST_ENV_VERSION := 8.2
 REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},/tmp/redis-env-work)
 
 define REDIS1_CONF
@@ -473,7 +473,7 @@ start: cleanup compile-module
 	echo "$$REDIS_UDS" | redis-server -
 	echo "$$REDIS_UNAVAILABLE_CONF" | redis-server -
 	redis-cli -a cluster --cluster create 127.0.0.1:7479 127.0.0.1:7480 127.0.0.1:7481 --cluster-yes
-	docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.0.2
+	docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.2-RC1-pre
 
 cleanup:
 	- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
diff --git a/src/test/resources/env/.env b/src/test/resources/env/.env
index af18ea8236..dcb101570d 100644
--- a/src/test/resources/env/.env
+++ b/src/test/resources/env/.env
@@ -1,5 +1,5 @@
-REDIS_VERSION=8.0.2
-REDIS_STACK_VERSION=8.0.2
+REDIS_VERSION=8.2-RC1-pre
+REDIS_STACK_VERSION=8.2-RC1-pre
 CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
 REDIS_ENV_CONF_DIR=./
 REDIS_MODULES_DIR=/tmp
diff --git a/src/test/resources/env/.env.v8.0 b/src/test/resources/env/.env.v8.0
new file mode 100644
index 0000000000..af18ea8236
--- /dev/null
+++ b/src/test/resources/env/.env.v8.0
@@ -0,0 +1,8 @@
+REDIS_VERSION=8.0.2
+REDIS_STACK_VERSION=8.0.2
+CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
+REDIS_ENV_CONF_DIR=./
+REDIS_MODULES_DIR=/tmp
+REDIS_ENV_WORK_DIR=/tmp/redis-env-work
+
+ENABLE_MODULE_COMMAND_DIRECTIVE=--enable-module-command yes
\ No newline at end of file