Skip to content

Commit bc0d0fb

Browse files
authored
Fine-grained test matrix. (#742)
* Fine-grained test matrix. * Remove max parallel.
1 parent af137cf commit bc0d0fb

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7+
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
78
runs-on: ubuntu-latest
89
strategy:
910
fail-fast: false
10-
max-parallel: 5
1111
matrix:
1212
python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
13+
django-version: ['2.2', '3.0', '3.1', 'dev']
1314

1415
steps:
1516
- uses: actions/checkout@v2
@@ -49,6 +50,8 @@ jobs:
4950
- name: Tox tests
5051
run: |
5152
tox -v
53+
env:
54+
DJANGO: ${{ matrix.django-version }}
5255

5356
- name: Upload coverage
5457
uses: codecov/codecov-action@v1

tox.ini

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
pypy3-dj{22,30,31}
4-
py{36,37,38,39}-dj{22,30,31,master}
4+
py{36,37,38,39}-dj{22,30,31,dev}
55
docs
66

77
[gh-actions]
@@ -12,6 +12,13 @@ python =
1212
3.9: py39
1313
pypy3: pypy3
1414

15+
[gh-actions:env]
16+
DJANGO =
17+
2.2: dj22
18+
3.0: dj30
19+
3.1: dj31
20+
dev: djdev
21+
1522
[testenv]
1623
basepython =
1724
pypy3: pypy3
@@ -24,7 +31,7 @@ deps =
2431
dj22: Django>=2.2.1,<2.3
2532
dj30: Django>=3.0,<3.1
2633
dj31: Django>=3.1,<3.2
27-
djmaster: https://github.com/django/django/archive/master.tar.gz
34+
djdev: https://github.com/django/django/archive/master.tar.gz
2835
jinja2
2936
coverage
3037
jsmin==2.2.0
@@ -40,9 +47,10 @@ commands =
4047
{envbindir}/coverage report
4148
{envbindir}/coverage xml
4249
whitelist_externals = npm
43-
44-
[testenv:py{36,37,38,39}-djmaster]
45-
ignore_errors = True
50+
ignore_outcome =
51+
djdev: True
52+
ignore_errors =
53+
djdev: True
4654

4755
[testenv:docs]
4856
basepython = python3.8

0 commit comments

Comments
 (0)