build: better way to default versions in action matrix

nedbat · nedbat · commit a3aee38802c5 · 2025-12-09T06:46:56.000-05:00
These were flagged (incorrectly imo) by `actionlint`, but this is more
readable anyway.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -62,7 +62,7 @@ jobs:
 
   coverage:
     name: "${{ matrix.python-version }} on ${{ matrix.os }}"
-    runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
+    runs-on: "${{ matrix.os }}-${{ matrix.os-version }}"
     timeout-minutes: 10
 
     # Only run coverage if Python files or this workflow changed.
@@ -80,6 +80,8 @@ jobs:
           - ubuntu
           - macos
           - windows
+        os-version:
+          - latest
         python-version:
           # When changing this list, be sure to check the [gh] list in
           # tox.ini so that tox will run properly. PYVERSIONS
diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml
@@ -53,6 +53,8 @@ jobs:
       MATRIX_ID: "${{ matrix.py }}-${{ matrix.os }}-${{ matrix.arch }}"
     strategy:
       matrix:
+        minpy:
+          - "3.11"  # PYVERSIONS needed by cibuildwheel
         include:
           # To change the matrix, edit the choices, then process this file with cog:
           #
@@ -173,7 +175,7 @@ jobs:
       - name: "Install Python"
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
-          python-version: "${{ matrix.minpy || '3.11' }}" # PYVERSIONS needed by cibuildwheel
+          python-version: "${{ matrix.minpy }}"
           cache: pip
           cache-dependency-path: 'requirements/*.pip'
 
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -59,7 +59,7 @@ jobs:
 
   tests:
     name: "${{ matrix.python-version }} on ${{ matrix.os }}"
-    runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
+    runs-on: "${{ matrix.os }}-${{ matrix.os-version }}"
     timeout-minutes: 10
 
     # Don't run tests if the branch name includes "-notests".
@@ -78,6 +78,8 @@ jobs:
           - ubuntu
           - macos
           - windows
+        os-version:
+          - latest
         python-version:
           # When changing this list, be sure to check the [gh] list in
           # tox.ini so that tox will run properly. PYVERSIONS
