Skip to content

Commit

Permalink
Merge pull request #632 from CTPUG/feature/update_test_matrix
Browse files Browse the repository at this point in the history
Feature/update test matrix
  • Loading branch information
drnlm committed Jun 4, 2022
2 parents 6b196cf + c510bfc commit 49b62c4
Showing 1 changed file with 32 additions and 10 deletions.
42 changes: 32 additions & 10 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,31 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432

name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }} )
name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
django-version: ['2.2.0', '3.0.0', '3.1.0', 'main']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
django-version: ['2.2.0', '3.0.0', '3.1.0', '3.2.0', '4.0.0', 'main']
exclude:
- django-version: '4.0.0'
python-version: '3.6'
- django-version: '4.0.0'
python-version: '3.7'
- django-version: 'main'
python-version: '3.6'
- django-version: 'main'
python-version: '3.7'
- django-version: '2.2.0'
python-version: '3.10'
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements-dev.txt
Expand All @@ -59,7 +70,7 @@ jobs:
pip install 'https://github.com/django/django/archive/main.tar.gz'
if: matrix.django-version == 'main'
- name: Run Tests
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
env:
TESTDB: postgres
run: |
Expand All @@ -69,20 +80,31 @@ jobs:

runs-on: ubuntu-latest

name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }} )
name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
django-version: ['2.2.0', '3.0.0', '3.1.0', 'main']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
django-version: ['2.2.0', '3.0.0', '3.1.0', '3.2.0', '4.0.0', 'main']
exclude:
- django-version: '4.0.0'
python-version: '3.6'
- django-version: '4.0.0'
python-version: '3.7'
- django-version: 'main'
python-version: '3.6'
- django-version: 'main'
python-version: '3.7'
- django-version: '2.2.0'
python-version: '3.10'
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements-dev.txt
Expand All @@ -96,7 +118,7 @@ jobs:
pip install 'https://github.com/django/django/archive/main.tar.gz'
if: matrix.django-version == 'main'
- name: Run Tests
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
run: |
NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test
Expand Down

0 comments on commit 49b62c4

Please sign in to comment.