test newer versions

Author: amirreza8002

.github/workflows/ci.yml

@@ -19,13 +19,15 @@ jobs:
           - '5.1'
         valkey-version:
           - 'latest'
+          - '7.2.6'
+          - 'unstable'
 
         # Only test pre-release dependencies for the latest Python.
         include:
           # latest Django with pre-release valkey
-          - django-version: '5.0'
-            valkey-version: 'master'
-            python-version: '3.11'
+          - django-version: '5.1'
+            valkey-version: 'unstable'
+            python-version: '3.12'
 
           # latest valkey with pre-release Django
           - django-version: 'main'
@@ -34,8 +36,13 @@ jobs:
 
           # pre-release Django and valkey
           - django-version: 'main'
-            valkey-version: 'master'
-            python-version: '3.11'
+            valkey-version: 'unstable'
+            python-version: '3.12'
+
+          # 7.2.6 valkey with stable django
+          - django-version: '5.1'
+            valkey-version: '7.2.6'
+            python-version: '3.12'
 
     steps:
       - uses: actions/checkout@v4
@@ -69,8 +76,8 @@ jobs:
 
       - name: tests
         run: |
-          VALKEY_PRIMARY=$(tests/start_valkey.sh)
-          VALKEY_SENTINEL=$(tests/start_valkey.sh --sentinel)
+          VALKEY_PRIMARY=$(tests/start_valkey.sh --normal ${{ matrix.valkey-version }})
+          VALKEY_SENTINEL=$(tests/start_valkey.sh --sentinel ${{ matrix.valkey-version }})
           CONTAINERS="$VALKEY_PRIMARY $VALKEY_SENTINEL"
           trap "docker stop $CONTAINERS && docker rm $CONTAINERS" EXIT
           tests/wait_for_valkey.sh $VALKEY_PRIMARY 6379

tests/start_valkey.sh

@@ -10,7 +10,7 @@ fi
 ARGS=()
 PORT=6379
 SENTINEL=0
-while (($# > 0)); do
+if (($# > 0)); then
   case "$1" in
     --sentinel)
       # setup a valkey sentinel
@@ -32,7 +32,7 @@ EOF
       shift
       ;;
   esac
-done
+fi
 
 # open a unix socket for socket tests
 if [[ $SENTINEL == 0 ]]; then
@@ -42,12 +42,14 @@ if [[ $SENTINEL == 0 ]]; then
 fi
 
 # start valkey
-sudo docker run \
+VAL_ID=sudo docker run \
   --health-cmd "valkey-cli -p $PORT:$PORT ping" \
   --health-interval 10s \
   --health-retries 5 \
   --health-timeout 5s \
   --network host \
   --user $(id -u):$(id -g) \
   --volume /tmp:/tmp \
-  --detach valkey/valkey valkey-server "${ARGS[@]}"
+  --detach "valkey/valkey:$2"
+
+sudo docker exec "$VAL_ID" valkey-server "${ARGS[@]}"