From dbca980f10f2b2b44464bc73eea51576b88879a6 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Tue, 2 May 2023 12:00:44 +0300
Subject: [PATCH] CI matrix changes

---
 .github/workflows/build.yml | 7 ++++---
 Makefile                    | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 30fb9e85..21f1193c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,11 +16,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.18.x, 1.19.x, 1.20.x]
+        redis-version: ['5.0.14', '6.0.19', '6.2.12', '7.0.11', '7.2-rc1']
 
     services:
       redis:
-        image: redis:7.2-rc
+        image: redis:${{matrix.redis-version}}
         options: >-
           --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
@@ -36,4 +37,4 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Test
-        run: make test
+        run: make test REDIS_VERSION=${{matrix.redis-version}}
diff --git a/Makefile b/Makefile
index 285f65dd..55fcd533 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
 
+REDIS_VERSION := 7.2-rc1
+
 test: testdeps
 	set -e; for dir in $(GO_MOD_DIRS); do \
 	  echo "go test in $${dir}"; \
@@ -23,7 +25,7 @@ bench: testdeps
 
 testdata/redis:
 	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.2-rc1.tar.gz | tar xvz --strip-components=1 -C $@
+	wget -qO- https://download.redis.io/releases/redis-${REDIS_VERSION}.tar.gz | tar xvz --strip-components=1 -C $@
 
 testdata/redis/src/redis-server: testdata/redis
 	cd $< && make all