diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01fa38ef0fc..a8defc8269f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,13 +23,13 @@ jobs: targets: PYTHON_ENV=py38 requirements.js clean_static static acceptance - django-env: django42 testname: quality-and-jobs - targets: PYTHON_ENV=py38 requirements.js check_translations_up_to_date validate_translations clean_static static quality validate_js check_keywords + targets: DJANGO_ENV=django42 PYTHON_ENV=py38 requirements.js check_translations_up_to_date validate_translations clean_static static quality validate_js check_keywords - django-env: django42 testname: test-python - targets: PYTHON_ENV=py38 requirements.js clean_static static validate_python + targets: DJANGO_ENV=django42 PYTHON_ENV=py38 requirements.js clean_static static validate_python - django-env: django42 testname: acceptance-python - targets: PYTHON_ENV=py38 requirements.js clean_static static acceptance + targets: DJANGO_ENV=django42 PYTHON_ENV=py38 requirements.js clean_static static acceptance steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index f2665c563c3..c37267152fe 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist=True -envlist = py38-django32-{static,pylint,tests,theme_static,check_keywords},py38-{isort,pycodestyle,extract_translations,dummy_translations,compile_translations, detect_changed_translations,validate_translations},docs +envlist = py38-django32-{static,pylint,tests,theme_static,check_keywords},py38-{isort,pycodestyle,extract_translations,dummy_translations,compile_translations, detect_changed_translations,validate_translations},py38-django42-{static,pylint,tests,theme_static,check_keywords},docs [pytest] addopts = --ds=ecommerce.settings.test --cov=ecommerce --cov-report term --cov-config=.coveragerc --no-cov-on-fail -p no:randomly --no-migrations -m "not acceptance" @@ -48,6 +48,7 @@ setenv = deps = -r{toxinidir}/requirements/test.txt django32: Django>=3.2,<3.3 + django42: Django==4.2 allowlist_externals = /bin/bash changedir =