From e5d3e919d3d7532e299b8c5d1f8779d76566ec35 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Thu, 14 Aug 2025 16:31:21 +0200 Subject: [PATCH 1/3] Explicitly call out the selenium job in the GitHub actions matrix --- .github/workflows/test.yml | 13 +++++++++++++ tox.ini | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2ded4678..4af323455 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,6 +88,9 @@ jobs: database: psycopg3 - python-version: '3.13' database: postgis3 + - python-version: '3.13' + database: postgresql + name: selenium services: postgres: @@ -138,11 +141,21 @@ jobs: python -m pip install --upgrade tox tox-gh-actions - name: Test with tox + if: matrix.name != 'selenium' + run: tox + env: + DB_BACKEND: ${{ matrix.database }} + DB_HOST: localhost + DB_PORT: 5432 + + - name: Test with tox (selenium) + if: matrix.name == 'selenium' run: tox env: DB_BACKEND: ${{ matrix.database }} DB_HOST: localhost DB_PORT: 5432 + DJANGO_SELENIUM_TESTS: true sqlite: runs-on: ubuntu-latest diff --git a/tox.ini b/tox.ini index e2dcdd6c6..7e7047717 100644 --- a/tox.ini +++ b/tox.ini @@ -42,7 +42,6 @@ passenv= setenv = PYTHONPATH = {toxinidir} PYTHONWARNINGS = d - py311-dj42-postgresql: DJANGO_SELENIUM_TESTS = {env:DJANGO_SELENIUM_TESTS:true} DB_NAME = {env:DB_NAME:debug_toolbar} DB_USER = {env:DB_USER:debug_toolbar} DB_HOST = {env:DB_HOST:localhost} From 0d7769c4c13fbe30bcba9c56f8ac87d142fd14a8 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Thu, 14 Aug 2025 17:01:48 +0200 Subject: [PATCH 2/3] I really hate this --- .github/workflows/test.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4af323455..0e32d4874 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -90,7 +90,8 @@ jobs: database: postgis3 - python-version: '3.13' database: postgresql - name: selenium + env: + DJANGO_SELENIUM_TESTS=true services: postgres: @@ -141,22 +142,12 @@ jobs: python -m pip install --upgrade tox tox-gh-actions - name: Test with tox - if: matrix.name != 'selenium' run: tox env: DB_BACKEND: ${{ matrix.database }} DB_HOST: localhost DB_PORT: 5432 - - name: Test with tox (selenium) - if: matrix.name == 'selenium' - run: tox - env: - DB_BACKEND: ${{ matrix.database }} - DB_HOST: localhost - DB_PORT: 5432 - DJANGO_SELENIUM_TESTS: true - sqlite: runs-on: ubuntu-latest strategy: From 73d58e4ba505a77ccdfa36e97de78f8c82bb2dc6 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Thu, 14 Aug 2025 18:29:25 +0200 Subject: [PATCH 3/3] No idea why claude things this makes a difference --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e32d4874..0688bb04c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -147,6 +147,7 @@ jobs: DB_BACKEND: ${{ matrix.database }} DB_HOST: localhost DB_PORT: 5432 + DJANGO_SELENIUM_TESTS: ${{ matrix.env.DJANGO_SELENIUM_TESTS }} sqlite: runs-on: ubuntu-latest