From 5a60ce6ac7059a1239fb15bbde4b14b806deb8d1 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 14:14:49 -0500 Subject: [PATCH 1/8] add `django-version` to job matrix --- .github/workflows/test.yml | 8 ++++++++ tox.ini | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index afab425b6..f8358d866 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,12 @@ jobs: max-parallel: 5 matrix: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + django-version: ['3.2', '4.0', '4.1', 'main'] + exclude: + - python-version: '3.7' + django-version: '4.0' + - python-version: '3.7' + django-version: '4.1' steps: - uses: actions/checkout@v2 @@ -42,6 +48,8 @@ jobs: - name: Tox tests run: | tox -v + env: + DJANGO: ${{ matrix.django-version }} - name: Upload coverage uses: codecov/codecov-action@v1 diff --git a/tox.ini b/tox.ini index 7c30c7da5..adff52a8f 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,15 @@ python = 3.10: py310 3.11: py311 +[gh-actions:env] +DJANGO = + 2.2: dj22 + 3.2: dj32 + 4.0: dj40 + 4.1: dj41 + main: djmain + + [pytest] django_find_project = false addopts = From 0c2b0d1c918a04256a629980748d3751de438686 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 14:36:31 -0500 Subject: [PATCH 2/8] adjust job name --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8358d866..b99f2f0d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,6 +4,7 @@ on: [push, pull_request] jobs: build: + name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}) runs-on: ubuntu-latest strategy: fail-fast: false From 8df8a5b7048870f5bffff8572090c9c7b67e8469 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 14:37:03 -0500 Subject: [PATCH 3/8] add django 2.2 and adjust exclude matrix --- .github/workflows/test.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b99f2f0d2..0d0fe8c1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,12 +11,21 @@ jobs: max-parallel: 5 matrix: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.0', '4.1', 'main'] + django-version: ['2.2', '3.2', '4.0', '4.1', 'main'] exclude: + # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django + + # Python > 3.9 is not supported by Django 2.2 + - python-version: '3.10' + django-version: '2.2' + + # Python 3.7 is not supported by Django 4.0+ - python-version: '3.7' django-version: '4.0' - python-version: '3.7' django-version: '4.1' + - python-version: '3.7' + django-version: 'main' steps: - uses: actions/checkout@v2 From 3b7cdafef89196560a104dd4b1158c486ff01607 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 14:56:46 -0500 Subject: [PATCH 4/8] remove max-parallel restriction --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d0fe8c1a..474323a60 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,6 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false - max-parallel: 5 matrix: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] django-version: ['2.2', '3.2', '4.0', '4.1', 'main'] From c359ae9269abcabedc5d192c6f07951362f646b7 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 15:05:07 -0500 Subject: [PATCH 5/8] change comments to be clearer --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 474323a60..734e4dfe3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: exclude: # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django - # Python > 3.9 is not supported by Django 2.2 + # Python 3.10+ is not supported by Django 2.2 - python-version: '3.10' django-version: '2.2' From 7b8a1f33f610eaef7287167cbb773df68e9d1023 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 27 Oct 2022 15:16:59 -0500 Subject: [PATCH 6/8] remove extra newline --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index adff52a8f..12431ada6 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,6 @@ DJANGO = 4.1: dj41 main: djmain - [pytest] django_find_project = false addopts = From f397dff80ba604e70b0c092f37e07ff98536e3fa Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 31 Oct 2022 09:33:02 -0500 Subject: [PATCH 7/8] remove whitespace --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 734e4dfe3..e770ca822 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: # Python 3.10+ is not supported by Django 2.2 - python-version: '3.10' django-version: '2.2' - + # Python 3.7 is not supported by Django 4.0+ - python-version: '3.7' django-version: '4.0' From d8318db241df7ce2884c6a9f9c7cc1df721bd101 Mon Sep 17 00:00:00 2001 From: Darrel O'Pry Date: Mon, 13 Feb 2023 11:25:43 -0500 Subject: [PATCH 8/8] chore: add success test decouple successful from specific matrix builds to avoid GH admin intervention as we update our supported matrix. --- .github/workflows/test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e770ca822..46532305b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,3 +64,11 @@ jobs: uses: codecov/codecov-action@v1 with: name: Python ${{ matrix.python-version }} + + success: + needs: build + runs-on: ubuntu-latest + name: Test successful + steps: + - name: Success + run: echo Test successful \ No newline at end of file