Skip to content

Commit 9757793

Browse files
amirreza8002amirreza8002
committed
update CI
1 parent 87a3ada commit 9757793

File tree

5 files changed

+45
-31
lines changed

5 files changed

+45
-31
lines changed

‎.github/workflows/ci.yml

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,42 @@ jobs:
1313
- '3.10'
1414
- '3.11'
1515
- '3.12'
16+
- '3.13'
1617
django-version:
1718
- '4.2'
1819
- '5.0'
1920
- '5.1'
2021
valkey-version:
2122
- 'latest'
22-
23-
# Only test pre-release dependencies for the latest Python.
24-
include:
25-
# latest Django with pre-release valkey
26-
- django-version: '5.0'
27-
valkey-version: 'master'
28-
python-version: '3.11'
29-
30-
# latest valkey with pre-release Django
31-
- django-version: 'main'
32-
valkey-version: 'latest'
33-
python-version: '3.12'
34-
35-
# pre-release Django and valkey
36-
- django-version: 'main'
37-
valkey-version: 'master'
38-
python-version: '3.11'
39-
23+
- '7.2'
24+
25+
services:
26+
valkey:
27+
image: valkey/valkey:${{ matrix.valkey-version }}
28+
ports:
29+
- 6379:6379
30+
options: >-
31+
--health-cmd "valkey-cli ping"
32+
--health-interval 10s
33+
--health-timeout 5s
34+
--health-retries 5
35+
--volume /tmp:/tmp
36+
env:
37+
VALKEY_EXTRA_FLAGS: '--save "" --unixsocket /tmp/valkey.sock --unixsocketperm 777'
38+
39+
sentinel:
40+
image: bitnami/valkey-sentinel:${{ matrix.valkey-version }}
41+
ports:
42+
- 26379:26379
43+
options: >-
44+
--health-cmd "valkey-cli -p 26379 ping"
45+
--health-interval 10s
46+
--health-timeout 5s
47+
--health-retries 5
48+
--volume /tmp:/tmp
49+
env:
50+
VALKEY_SENTINEL_QUORUM: "1"
51+
VALKEY_SENTINEL_AOF_ENABLED: "no"
4052
steps:
4153
- uses: actions/checkout@v4
4254

@@ -65,7 +77,9 @@ jobs:
6577
poetry config virtualenvs.in-project true --local
6678
6779
- name: Install project
68-
run: poetry install --no-interaction --all-extras
80+
run: |
81+
poetry add django==${{ matrix.django-version }}
82+
poetry install --no-interaction --all-extras
6983
7084
- name: tests
7185
run: |

‎tests/settings/sqlite_async_sentinel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
CACHES = {
1010
"default": {
1111
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
12-
"LOCATION": ["valkey://default_service?db=1"],
12+
"LOCATION": ["valkey://mymaster?db=1"],
1313
"OPTIONS": {
1414
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",
1515
"SENTINELS": SENTINELS,
@@ -25,15 +25,15 @@
2525
},
2626
"sample": {
2727
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
28-
"LOCATION": "valkey://default_service?db=1",
28+
"LOCATION": "valkey://mymaster?db=1",
2929
"OPTIONS": {
3030
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncSentinelClient",
3131
"SENTINELS": SENTINELS,
3232
},
3333
},
3434
"with_prefix": {
3535
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
36-
"LOCATION": "valkey://default_service?db=1",
36+
"LOCATION": "valkey://mymaster?db=1",
3737
"KEY_PREFIX": "test-prefix",
3838
"OPTIONS": {
3939
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",

‎tests/settings/sqlite_async_sentinel_opts.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
CACHES = {
88
"default": {
99
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
10-
"LOCATION": ["valkey://default_service?db=5"],
10+
"LOCATION": ["valkey://mymaster?db=5"],
1111
"OPTIONS": {
1212
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",
1313
"SENTINELS": SENTINELS,
@@ -25,7 +25,7 @@
2525
},
2626
"sample": {
2727
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
28-
"LOCATION": "valkey://default_service?db=1",
28+
"LOCATION": "valkey://mymaster?db=1",
2929
"OPTIONS": {
3030
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncSentinelClient",
3131
"SENTINELS": SENTINELS,
@@ -34,7 +34,7 @@
3434
},
3535
"with_prefix": {
3636
"BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
37-
"LOCATION": "valkey://default_service?db=1",
37+
"LOCATION": "valkey://mymaster?db=1",
3838
"KEY_PREFIX": "test-prefix",
3939
"OPTIONS": {
4040
"CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",

‎tests/settings/sqlite_sentinel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
CACHES = {
88
"default": {
99
"BACKEND": "django_valkey.cache.ValkeyCache",
10-
"LOCATION": ["valkey://default_service?db=1"],
10+
"LOCATION": ["valkey://mymaster?db=1"],
1111
"OPTIONS": {
1212
"CLIENT_CLASS": "django_valkey.client.DefaultClient",
1313
"SENTINELS": SENTINELS,
@@ -23,15 +23,15 @@
2323
},
2424
"sample": {
2525
"BACKEND": "django_valkey.cache.ValkeyCache",
26-
"LOCATION": "valkey://default_service?db=1",
26+
"LOCATION": "valkey://mymaster?db=1",
2727
"OPTIONS": {
2828
"CLIENT_CLASS": "django_valkey.client.SentinelClient",
2929
"SENTINELS": SENTINELS,
3030
},
3131
},
3232
"with_prefix": {
3333
"BACKEND": "django_valkey.cache.ValkeyCache",
34-
"LOCATION": "valkey://default_service?db=1",
34+
"LOCATION": "valkey://mymaster?db=1",
3535
"KEY_PREFIX": "test-prefix",
3636
"OPTIONS": {
3737
"CLIENT_CLASS": "django_valkey.client.DefaultClient",

‎tests/settings/sqlite_sentinel_opts.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
CACHES = {
88
"default": {
99
"BACKEND": "django_valkey.cache.ValkeyCache",
10-
"LOCATION": ["valkey://default_service?db=5"],
10+
"LOCATION": ["valkey://mymaster?db=5"],
1111
"OPTIONS": {
1212
"CLIENT_CLASS": "django_valkey.client.DefaultClient",
1313
"SENTINELS": SENTINELS,
@@ -25,7 +25,7 @@
2525
},
2626
"sample": {
2727
"BACKEND": "django_valkey.cache.ValkeyCache",
28-
"LOCATION": "valkey://default_service?db=1",
28+
"LOCATION": "valkey://mymaster?db=1",
2929
"OPTIONS": {
3030
"CLIENT_CLASS": "django_valkey.client.SentinelClient",
3131
"SENTINELS": SENTINELS,
@@ -34,7 +34,7 @@
3434
},
3535
"with_prefix": {
3636
"BACKEND": "django_valkey.cache.ValkeyCache",
37-
"LOCATION": "valkey://default_service?db=1",
37+
"LOCATION": "valkey://mymaster?db=1",
3838
"KEY_PREFIX": "test-prefix",
3939
"OPTIONS": {
4040
"CLIENT_CLASS": "django_valkey.client.DefaultClient",

0 commit comments

Comments
 (0)