Skip to content

Commit 5964f37

Browse files
committed
More fixes in integration workflow
1 parent cfe2be7 commit 5964f37

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

.github/actions/run-tests/action.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@ description: 'Runs redis-py tests against different Redis versions and configura
33
inputs:
44
python-version:
55
description: 'Python version to use for running tests'
6-
required: true
76
default: '3.12'
87
test-type:
9-
description: 'Type of tests to run'
8+
description: 'Type of tests to run: standalone or cluster'
109
required: true
11-
default: 'standalone'
1210
parser-backend:
13-
description: 'Parser backend to use'
11+
description: 'Parser backend to use: plain or hiredis'
1412
required: true
15-
default: 'plain'
1613
resp-protocol:
17-
description: 'RESP protocol version to use'
14+
description: 'RESP protocol version to use: 2 or 3'
1815
required: true
19-
default: '2'
2016
redis-version:
2117
description: 'Redis version to test against'
2218
required: true
@@ -49,10 +45,10 @@ runs:
4945
invoke devenv
5046
sleep 10 # time to settle
5147
52-
if [ "${{input.event-loop}}" == "uvloop" ]; then
53-
invoke ${{input.test-type}}-tests --uvloop --protocol=${{inputs.resp-protocol}}
48+
if [ "${{inputs.event-loop}}" == "uvloop" ]; then
49+
invoke ${{inputs.test-type}}-tests --uvloop --protocol=${{inputs.resp-protocol}}
5450
else
55-
invoke ${{input.test-type}}-tests --protocol=${{inputs.resp-protocol}}
51+
invoke ${{inputs.test-type}}-tests --protocol=${{inputs.resp-protocol}}
5652
fi
5753
5854
ls -1
@@ -61,9 +57,9 @@ runs:
6157
- name: Upload test results and profiling data
6258
uses: actions/upload-artifact@v4
6359
with:
64-
name: pytest-results-${{input.test-type}}-${{input.parser-backend}}-${{input.python-version}}-${{input.event-loop}}-${{input.resp-protocol}}
60+
name: pytest-results-${{inputs.test-type}}-${{inputs.parser-backend}}-${{inputs.python-version}}-${{inputs.event-loop}}-${{inputs.resp-protocol}}
6561
path: |
66-
${{input.test-type}}*-results.xml
62+
${{inputs.test-type}}*-results.xml
6763
prof/**
6864
profile_output*
6965
if-no-files-found: error

.github/workflows/integration.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,30 @@ jobs:
7070
parser-backend: ['hiredis', 'plain']
7171
event-loop: ['asyncio']
7272
include:
73-
# Run python compatibility and uvloop tests only for latest redis version and plain parser backends
74-
- python-version: ['3.9', '3.10', '3.11', 'pypy-3.9', 'pypy-3.10']
75-
event-loop: ['asyncio', 'uvloop']
73+
# Run python compatibility tests only for latest redis version and plain parser backends
74+
- python-version: '3.9'
7675
resp-protocol: '2'
7776
redis-version: '8.0.0-M01'
7877
parser-backend: 'plain'
78+
- python-version: '3.10'
79+
resp-protocol: '2'
80+
redis-version: '8.0.0-M01'
81+
parser-backend: 'hiredis'
82+
- python-version: '3.11'
83+
resp-protocol: '2'
84+
redis-version: '8.0.0-M01'
85+
parser-backend: 'plain'
86+
- python-version: 'pypy-3.9'
87+
resp-protocol: '2'
88+
redis-version: '8.0.0-M01'
89+
parser-backend: 'plain'
90+
- python-version: 'pypy-3.10'
91+
resp-protocol: '2'
92+
redis-version: '8.0.0-M01'
93+
parser-backend: 'plain'
94+
# Run uvloop tests only for resp3
95+
- resp-protocol: '3'
96+
event-loop: 'uvloop'
7997
exclude:
8098
- test-type: 'cluster'
8199
parser-backend: 'hiredis'

0 commit comments

Comments
 (0)