From 33762c1a53f9cba1c43062dd126e095a7c4fb176 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Feb 2025 03:59:07 -0500 Subject: [PATCH 1/5] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d9ce1c6d..85f996bd 100644 --- a/tox.ini +++ b/tox.ini @@ -53,7 +53,7 @@ deps = ruff==0.9.5 mypy==1.15.0 commands = - ruff check {posargs:pytest_django pytest_django_test tests} + ruff check --diff {posargs:pytest_django pytest_django_test tests} ruff format --quiet --diff {posargs:pytest_django pytest_django_test tests} mypy {posargs:pytest_django pytest_django_test tests} From 422660f7bb26e030e83df9ad414a3b37898dfdf3 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Feb 2025 04:03:11 -0500 Subject: [PATCH 2/5] Update main.yml --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc1da1c4..5970c3f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,10 @@ on: branches: - main +concurrency: + group: ci-main-${{ github.ref }} + cancel-in-progress: true + env: PYTEST_ADDOPTS: "--color=yes" From d61d12353b4d23ec203469fe3728582cfad3cbba Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Feb 2025 04:17:41 -0500 Subject: [PATCH 3/5] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5970c3f4..886e6a26 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: concurrency: group: ci-main-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} env: PYTEST_ADDOPTS: "--color=yes" From 543c6bac364a4206491143280bdca51a4d5b3388 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Feb 2025 04:18:30 -0500 Subject: [PATCH 4/5] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 886e6a26..303d7846 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,7 @@ on: concurrency: group: ci-main-${{ github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + # Test cancel env: PYTEST_ADDOPTS: "--color=yes" From 47f721ccdc30b15409d4b41a4cca92f90aba0295 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Mon, 10 Feb 2025 04:19:32 -0500 Subject: [PATCH 5/5] nice! works! --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 303d7846..886e6a26 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,6 @@ on: concurrency: group: ci-main-${{ github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - # Test cancel env: PYTEST_ADDOPTS: "--color=yes"