Commit 8a05390
committed
Tune CI matrix adjustments so reports are clearer
Since #1987, test jobs from `pythonpackage.yml` appear in an
unintuitive order, and some show an extra bool matrix variable in
their names while others don't (this corresponds to `experimental`,
which was always set to some value, but was set in different ways).
This fixes that by:
- Listing all tested versions, rather than introducing some in an
`include` key. (The `include:`-introduced jobs didn't distinguish
between originally-present matrix variables and those that are
introduced based on the values of the original ones.)
- Replacing `os` with `os-type`, which has only the first part of
the value for `runs-on:` (e.g., `ubuntu`), and adding `os-ver`
to each matrix job, defaulting it to `latest`, but using `22.04`
for Python 3.7 on Ubuntu.
This should also naturally extend to adding 3.13, with or without
setting `continue-on-error` to temporarily work around the problems
obseved in #1955, but nothing 3.13-related is done in this commit.1 parent cc1c643 commit 8a05390
1 file changed
Lines changed: 12 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,20 +12,21 @@ jobs: | |||
| 12 | 12 | build: | |
| 13 | 13 | strategy: | |
| 14 | 14 | matrix: | |
| 15 | - os: [ubuntu-latest, macos-latest, windows-latest] | ||
| 16 | - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] | ||
| 17 | - include: | ||
| 18 | - - experimental: false | ||
| 19 | - - os: ubuntu-22.04 | ||
| 15 | + os-type: [ubuntu, macos, windows] | ||
| 16 | + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] | ||
| 17 | + exclude: | ||
| 18 | + - os-type: macos | ||
| 20 | 19 | python-version: "3.7" | |
| 21 | - experimental: false | ||
| 22 | - - os: windows-latest | ||
| 20 | + include: | ||
| 21 | + - os-ver: latest | ||
| 22 | + - os-type: ubuntu | ||
| 23 | 23 | python-version: "3.7" | |
| 24 | - experimental: false | ||
| 24 | + os-ver: "22.04" | ||
| 25 | + - experimental: false | ||
| 25 | 26 | ||
| 26 | 27 | fail-fast: false | |
| 27 | 28 | ||
| 28 | - runs-on: ${{ matrix.os }} | ||
| 29 | + runs-on: ${{ matrix.os-type }}-${{ matrix.os-ver }} | ||
| 29 | 30 | ||
| 30 | 31 | defaults: | |
| 31 | 32 | run: | |
@@ -43,7 +44,7 @@ jobs: | |||
| 43 | 44 | allow-prereleases: ${{ matrix.experimental }} | |
| 44 | 45 | ||
| 45 | 46 | - name: Set up WSL (Windows) | |
| 46 | - if: startsWith(matrix.os, 'windows') | ||
| 47 | + if: matrix.os-type == 'windows' | ||
| 47 | 48 | uses: Vampire/setup-wsl@v4.0.0 | |
| 48 | 49 | with: | |
| 49 | 50 | distribution: Alpine | |
@@ -80,7 +81,7 @@ jobs: | |||
| 80 | 81 | ||
| 81 | 82 | # For debugging hook tests on native Windows systems that may have WSL. | |
| 82 | 83 | - name: Show bash.exe candidates (Windows) | |
| 83 | - if: startsWith(matrix.os, 'windows') | ||
| 84 | + if: matrix.os-type == 'windows' | ||
| 84 | 85 | run: | | |
| 85 | 86 | set +e | |
| 86 | 87 | bash.exe -c 'printenv WSL_DISTRO_NAME; uname -a' | |
0 commit comments