Skip to content

Commit dbb3f72

Browse files
committed
use 8.0-M02
1 parent f33e418 commit dbb3f72

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.github/CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This guide explains how to bootstrap and manage a test environment for Jedis usi
3232

3333
## Workflow Steps
3434
1. **Start the test environment** by running the following command (examples below).
35-
- For instance, to start the environment with Redis 8.0-M01, use `make start-test-env`.
35+
- For instance, to start the environment with Redis 8.0-M02, use `make start-test-env`.
3636
2. **Run tests** through your IDE, Maven, or other testing tools as needed.
3737
3. **Stop the test environment** by running the following command:
3838
- `make stop-test-env`
@@ -43,17 +43,17 @@ This guide explains how to bootstrap and manage a test environment for Jedis usi
4343
You can bootstrap the test environment for supported versions of Redis using the provided `make` targets.
4444

4545
## Option 1: Using `make` Targets
46-
To bring up the test environment for a specific Redis version (8.0-M01, 7.4.1, 7.2.6, or 6.2.16), use the following command:
46+
To bring up the test environment for a specific Redis version (8.0-M02, 7.4.1, 7.2.6, or 6.2.16), use the following command:
4747
```bash
48-
make start-test-env version=8.0-M01 # Replace with desired version
48+
make start-test-env version=8.0-M02 # Replace with desired version
4949
```
5050

5151
## Option 2: Using docker compose commands directly
5252
Docker compose file can be found in `src/test/resources/env` folder.
53-
- **Redis 8.0-M01, 7.4.1, 7.2.6**
53+
- **Redis 8.0-M02, 7.4.1, 7.2.6**
5454
```bash
5555
rm -rf /tmp/redis-env-work
56-
export REDIS_VERSION=8.0-M01
56+
export REDIS_VERSION=8.0-M02
5757
docker compose up
5858
```
5959
- **Redis 6.2.16**

.github/workflows/test-on-docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
redis_version:
39-
- "8.0-M01"
39+
- "8.0-M02"
4040
- "7.4.1"
4141
- "7.2.6"
4242
- "6.2.16"

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PATH := ./redis-git/src:${PATH}
22

33
# Supported test env versions
4-
SUPPORTED_TEST_ENV_VERSIONS := 8.0-M01 7.4.1 7.2.6 6.2.16
5-
DEFAULT_TEST_ENV_VERSION := 8.0-M01
4+
SUPPORTED_TEST_ENV_VERSIONS := 8.0-M02 7.4.1 7.2.6 6.2.16
5+
DEFAULT_TEST_ENV_VERSION := 8.0-M02
66

77
define REDIS1_CONF
88
daemonize yes

src/test/resources/env/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REDIS_VERSION=8.0-M01
1+
REDIS_VERSION=8.0-M02
22
CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
33
REDIS_ENV_CONF_DIR=./
44
REDIS_MODULES_DIR=/tmp

src/test/resources/env/docker-compose.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
redis1-2-5-8-sentinel:
33
sysctls:
44
- net.ipv6.conf.all.disable_ipv6=1
5-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
5+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
66
container_name: redis1-2-5-8-sentinel
77
#network_mode: host
88
environment:
@@ -25,7 +25,7 @@ services:
2525
redis3-4-sentinel:
2626
sysctls:
2727
- net.ipv6.conf.all.disable_ipv6=1
28-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
28+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
2929
container_name: redis3-4-sentinel
3030
#network_mode: host
3131
environment:
@@ -48,7 +48,7 @@ services:
4848
redis6-7-sentinel:
4949
sysctls:
5050
- net.ipv6.conf.all.disable_ipv6=1
51-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
51+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
5252
container_name: redis6-7-sentinel
5353
#network_mode: host
5454
environment:
@@ -65,7 +65,7 @@ services:
6565
redis9-sentinel:
6666
sysctls:
6767
- net.ipv6.conf.all.disable_ipv6=1
68-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
68+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
6969
container_name: redis9-sentinel
7070
#network_mode: host
7171
environment:
@@ -85,7 +85,7 @@ services:
8585
redis10-11:
8686
sysctls:
8787
- net.ipv6.conf.all.disable_ipv6=1
88-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
88+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
8989
container_name: redis10-11
9090
#network_mode: host
9191
environment:
@@ -99,7 +99,7 @@ services:
9999
redis-unavailable:
100100
sysctls:
101101
- net.ipv6.conf.all.disable_ipv6=1
102-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
102+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
103103
container_name: redis-unavailable-1
104104
#network_mode: host
105105
environment:
@@ -113,7 +113,7 @@ services:
113113
cluster-unbound:
114114
sysctls:
115115
- net.ipv6.conf.all.disable_ipv6=1
116-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
116+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
117117
container_name: cluster-unbound-1
118118
environment:
119119
- TLS_ENABLED=yes
@@ -128,7 +128,7 @@ services:
128128
cluster-stable:
129129
sysctls:
130130
- net.ipv6.conf.all.disable_ipv6=1
131-
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M01}"
131+
image: "${CLIENT_LIBS_TEST_IMAGE}:${REDIS_VERSION:-8.0-M02}"
132132
container_name: cluster-stable-1
133133
#network_mode: host
134134
command: --cluster-announce-ip 127.0.0.1
@@ -151,7 +151,7 @@ services:
151151
- "6479:6379"
152152
#todo find a way to connect from mac os host to exposed unix socket in container
153153
# redis_uds:
154-
# image: redis:8.0-M01
154+
# image: redis:8.0-M02
155155
# container_name: redis_uds
156156
# #network_mode: host
157157
# command: redis-server /etc/redis.conf

0 commit comments

Comments
 (0)