fix: make the lowest-dependencies platform configurable.

canonical · Nov 15, 2024 · 8edf6fa · 8edf6fa
1 parent f01b4e5
commit 8edf6fa
Showing 1 changed file with 29 additions and 22 deletions.
diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
@@ -12,10 +12,6 @@ on:
         default: '["3.10", "3.11", "3.12", "3.13"]'
         description: |
           The python versions to run fast tests on, as a JSON array.
-      lowest-python-version:
-        type: string
-        description: |
-          The Python version to run when using "lowest" resolution for tests.
       slow-test-platforms:
         type: string
         default: '["jammy"]'
@@ -26,6 +22,16 @@ on:
         default: '["3.10"]'
         description: |
           The python versions to run slow tests on, as a JSON array.
+      lowest-python-platform:
+        type: string
+        description: |
+          The platform to run the lowest python version tests on.
+        default: "ubuntu-20.04"
+      lowest-python-version:
+        type: string
+        description: |
+          The Python version to run when using "lowest" resolution for tests.
+        default: "3.10"
 
 jobs:
   fast:
@@ -74,13 +80,15 @@ jobs:
           path: |
             ./coverage.xml
             htmlcov/**
-  lowest:
-    name: Minimum dependencies (all tests)
-    if: ${{ inputs.lowest-python-version }} != ''
-    runs-on: jammy
+  slow:
+    name: Slow tests
+    strategy:
+      matrix:
+        platform: ${{ fromJson(inputs.slow-test-platforms) }}
+        python-version: ${{ fromJson(inputs.slow-test-python-versions) }}
+    runs-on: ${{ matrix.platform }}
     env:
-      UV_PYTHON: ${{ inputs.lowest-python-version }}
-      UV_RESOLUTION: lowest
+      PYTEST_ADDOPTS: --no-header -v -rN -m 'slow'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -90,7 +98,7 @@ jobs:
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
-          cache-suffix: lowest-jammy
+          cache-suffix: ${{ toJSON(matrix.platform) }}
       - name: Install tools
         run: |
           make setup-tests
@@ -100,20 +108,18 @@ jobs:
       - name: Upload test coverage
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-lowest-py${{ inputs.lowest-python-version }}
+          name: coverage-slow-${{ matrix.platform }}-${{ matrix.python-version }}
           overwrite: true
           path: |
             ./coverage.xml
             htmlcov/**
-  slow:
-    name: Slow tests
-    strategy:
-      matrix:
-        platform: ${{ fromJson(inputs.slow-test-platforms) }}
-        python-version: ${{ fromJson(inputs.slow-test-python-versions) }}
-    runs-on: ${{ matrix.platform }}
+  lowest:
+    name: Minimum dependencies (all tests)
+    if: ${{ inputs.lowest-python-version }} != ''
+    runs-on: ${{ inputs.lowest-python-platform }}
     env:
-      PYTEST_ADDOPTS: --no-header -v -rN -m 'slow'
+      UV_PYTHON: ${{ inputs.lowest-python-version }}
+      UV_RESOLUTION: lowest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -123,7 +129,7 @@ jobs:
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
-          cache-suffix: ${{ toJSON(matrix.platform) }}
+          cache-suffix: lowest-jammy
       - name: Install tools
         run: |
           make setup-tests
@@ -133,8 +139,9 @@ jobs:
       - name: Upload test coverage
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-slow-${{ matrix.platform }}-${{ matrix.python-version }}
+          name: coverage-lowest-py${{ inputs.lowest-python-version }}
           overwrite: true
           path: |
             ./coverage.xml
             htmlcov/**
+