ci: Speed up runs

.github/workflows/ci.yml

@@ -92,19 +92,59 @@ jobs:
         run: uv run slotscheck -m advanced_alchemy.config  -m advanced_alchemy.repository -m advanced_alchemy.service -m advanced_alchemy.extensions -m advanced_alchemy.base -m advanced_alchemy.types -m advanced_alchemy.operations
 
   test:
-    name: "test (${{ matrix.python-version }}"
+    name: "${{ matrix.python-version }} [${{ matrix.pytest-select }}]"
     strategy:
       fail-fast: true
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        pytest-select:
+          - "not oracle and not pg"
+          - "pg"
+          - "oracle"
     uses: ./.github/workflows/test.yml
     with:
-      coverage: ${{ matrix.python-version == '3.13' }}
+      coverage: ${{ matrix.python-version == '3.13'}}
       python-version: ${{ matrix.python-version }}
+      pytest-select: ${{ matrix.pytest-select }}
+  process_coverage:
+    name: merge-coverage-files
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.13
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: coverage-data
+          pattern: coverage-data-*
+          merge-multiple: true
+
+      - name: Combine coverage files
+        run: |
+          uv venv
+          uv pip install coverage covdefaults
+          uv run python -m coverage combine coverage-data/
+          uv run python -m coverage xml -i
+
+      - name: Fix coverage file name
+        run: sed -i "s/home\/runner\/work\/advanced-alchemy\/advanced-alchemy/github\/workspace/g" coverage.xml
+
+      - name: Upload fixed coverage file
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-xml
+          path: coverage.xml
   sonar:
     needs:
-      - test
-      - validate
+      - process_coverage
     if: github.event.pull_request.head.repo.fork == false && github.repository_owner == 'litestar-org'
     runs-on: ubuntu-latest
     steps:
@@ -125,8 +165,7 @@ jobs:
 
   codecov:
     needs:
-      - test
-      - validate
+      - process_coverage
     runs-on: ubuntu-latest
     permissions:
       security-events: write
@@ -143,15 +182,6 @@ jobs:
           path: coverage.xml
           merge-multiple: true
 
-      # - name: Combine coverage files
-      #   run: |
-      #     python -Im pip install coverage covdefaults
-      #     python -Im coverage combine
-      #     python -Im coverage xml -i
-
-      # - name: Fix coverage file name
-      #   run: sed -i "s/home\/runner\/work\/advanced-alchemy\/advanced-alchemy/github\/workspace/g" coverage.xml
-
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
         with:

.github/workflows/test.yml

@@ -18,6 +18,9 @@ on:
         required: false
         type: number
         default: 60
+      pytest-select:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -61,14 +64,25 @@ jobs:
 
       - name: Test
         if: ${{ !inputs.coverage }}
-        run: uv run pytest --dist "loadgroup" -m "" tests -n 2
+        run: uv run pytest --dist "loadgroup" -m "" -k "${{ inputs.pytest-select }}" tests -n 2
 
       - name: Test with coverage
         if: ${{ inputs.coverage }}
-        run: uv run pytest tests --dist "loadgroup" -m "" --cov=advanced_alchemy --cov-report=xml -n 2
+        run: uv run pytest tests --dist "loadgroup" -m "" --cov=advanced_alchemy -k "${{ inputs.pytest-select }}" --cov-report=xml -n 2
+
+      - uses: rlespinasse/slugify-value@v1.x
+        id: slugify-value
+        if: ${{ inputs.coverage }}
+        with:
+          key: pytest_select_slug
+          value: ${{ inputs.pytest-select }}
+
+      - name: Rename coverage file
+        if: ${{ inputs.coverage }}
+        run: mv .coverage coverage-data-${{ steps.slugify-value.outputs.slug }}.dat
 
       - uses: actions/upload-artifact@v4
         if: ${{ inputs.coverage }}
         with:
-          name: coverage-xml
-          path: coverage.xml
+          name: coverage-data-${{ steps.slugify-value.outputs.slug }}
+          path: coverage-data-${{ steps.slugify-value.outputs.slug }}.dat

pyproject.toml

@@ -88,6 +88,7 @@ dev = [
   { include-group = "spanner" },
   { include-group = "cockroachdb" },
   { include-group = "postgres" },
+  "pytest-cdist>=0.3.1",
 ]
 doc = [
   "auto-pytabs[sphinx]>=0.5.0",
@@ -139,6 +140,7 @@ test = [
   "pydantic-extra-types",
   "rich-click",
   "coverage>=7.6.1",
+  "covdefaults",
   "pytest>=7.4.4",
   "pytest-asyncio>=0.23.8",
   "pytest-cov>=5.0.0",