Skip to content

Commit 047fc56

Browse files
nedbatnedbat
committed
build: better way to default versions in action matrix
These were flagged (incorrectly imo) by `actionlint`, but this is more readable anyway.
1 parent 99cb3c7 commit 047fc56

File tree

3 files changed

+55
-49
lines changed

3 files changed

+55
-49
lines changed

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
coverage:
6464
name: "${{ matrix.python-version }} on ${{ matrix.os }}"
65-
runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
65+
runs-on: "${{ matrix.os }}-${{ matrix.os-version }}"
6666
timeout-minutes: 10
6767

6868
# Only run coverage if Python files or this workflow changed.
@@ -80,6 +80,8 @@ jobs:
8080
- ubuntu
8181
- macos
8282
- windows
83+
os-version:
84+
- latest
8385
python-version:
8486
# When changing this list, be sure to check the [gh] list in
8587
# tox.ini so that tox will run properly. PYVERSIONS

‎.github/workflows/kit.yml‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
# # When changing this, also adjust SHIPPING_WHEELS in env.py.
8484
#
8585
# pys = ["cp310", "cp311", "cp312", "cp313", "cp314"]
86+
# cipy = "3.11" # PYVERSIONS, default for cibuildwheel
8687
#
8788
# # Some OS/arch combinations need overrides for the Python versions:
8889
# os_arch_pys = {
@@ -100,62 +101,63 @@ jobs:
100101
# "os": the_os,
101102
# "py": the_py,
102103
# "arch": the_arch,
104+
# "cipy": cipy,
103105
# }
104106
# if the_os == "macos":
105107
# them["os-version"] = "14"
106108
# if the_os == "windows" and the_arch == "ARM64":
107109
# them["os-version"] = "11-arm"
108-
# # them["minpy"] = "3.11"
110+
# # them["cipy"] = "3.11"
109111
# if the_arch == "aarch64":
110112
# # https://github.com/pypa/cibuildwheel/issues/2257
111113
# them["os-version"] = "22.04-arm"
112114
# print(f"- {json.dumps(them)}")
113115
# ]]]
114-
- {"os": "ubuntu", "py": "cp310", "arch": "x86_64"}
115-
- {"os": "ubuntu", "py": "cp311", "arch": "x86_64"}
116-
- {"os": "ubuntu", "py": "cp312", "arch": "x86_64"}
117-
- {"os": "ubuntu", "py": "cp313", "arch": "x86_64"}
118-
- {"os": "ubuntu", "py": "cp314", "arch": "x86_64"}
119-
- {"os": "ubuntu", "py": "cp310", "arch": "i686"}
120-
- {"os": "ubuntu", "py": "cp311", "arch": "i686"}
121-
- {"os": "ubuntu", "py": "cp312", "arch": "i686"}
122-
- {"os": "ubuntu", "py": "cp313", "arch": "i686"}
123-
- {"os": "ubuntu", "py": "cp314", "arch": "i686"}
124-
- {"os": "ubuntu", "py": "cp310", "arch": "aarch64", "os-version": "22.04-arm"}
125-
- {"os": "ubuntu", "py": "cp311", "arch": "aarch64", "os-version": "22.04-arm"}
126-
- {"os": "ubuntu", "py": "cp312", "arch": "aarch64", "os-version": "22.04-arm"}
127-
- {"os": "ubuntu", "py": "cp313", "arch": "aarch64", "os-version": "22.04-arm"}
128-
- {"os": "ubuntu", "py": "cp314", "arch": "aarch64", "os-version": "22.04-arm"}
129-
- {"os": "ubuntu", "py": "cp310", "arch": "riscv64"}
130-
- {"os": "ubuntu", "py": "cp311", "arch": "riscv64"}
131-
- {"os": "ubuntu", "py": "cp312", "arch": "riscv64"}
132-
- {"os": "ubuntu", "py": "cp313", "arch": "riscv64"}
133-
- {"os": "ubuntu", "py": "cp314", "arch": "riscv64"}
134-
- {"os": "macos", "py": "cp310", "arch": "arm64", "os-version": "14"}
135-
- {"os": "macos", "py": "cp311", "arch": "arm64", "os-version": "14"}
136-
- {"os": "macos", "py": "cp312", "arch": "arm64", "os-version": "14"}
137-
- {"os": "macos", "py": "cp313", "arch": "arm64", "os-version": "14"}
138-
- {"os": "macos", "py": "cp314", "arch": "arm64", "os-version": "14"}
139-
- {"os": "macos", "py": "cp310", "arch": "x86_64", "os-version": "14"}
140-
- {"os": "macos", "py": "cp311", "arch": "x86_64", "os-version": "14"}
141-
- {"os": "macos", "py": "cp312", "arch": "x86_64", "os-version": "14"}
142-
- {"os": "macos", "py": "cp313", "arch": "x86_64", "os-version": "14"}
143-
- {"os": "macos", "py": "cp314", "arch": "x86_64", "os-version": "14"}
144-
- {"os": "windows", "py": "cp310", "arch": "x86"}
145-
- {"os": "windows", "py": "cp311", "arch": "x86"}
146-
- {"os": "windows", "py": "cp312", "arch": "x86"}
147-
- {"os": "windows", "py": "cp313", "arch": "x86"}
148-
- {"os": "windows", "py": "cp314", "arch": "x86"}
149-
- {"os": "windows", "py": "cp310", "arch": "AMD64"}
150-
- {"os": "windows", "py": "cp311", "arch": "AMD64"}
151-
- {"os": "windows", "py": "cp312", "arch": "AMD64"}
152-
- {"os": "windows", "py": "cp313", "arch": "AMD64"}
153-
- {"os": "windows", "py": "cp314", "arch": "AMD64"}
154-
- {"os": "windows", "py": "cp311", "arch": "ARM64", "os-version": "11-arm"}
155-
- {"os": "windows", "py": "cp312", "arch": "ARM64", "os-version": "11-arm"}
156-
- {"os": "windows", "py": "cp313", "arch": "ARM64", "os-version": "11-arm"}
157-
- {"os": "windows", "py": "cp314", "arch": "ARM64", "os-version": "11-arm"}
158-
# [[[end]]] (sum: bIrUw1gLSU)
116+
- {"os": "ubuntu", "py": "cp310", "arch": "x86_64", "cipy": "3.11"}
117+
- {"os": "ubuntu", "py": "cp311", "arch": "x86_64", "cipy": "3.11"}
118+
- {"os": "ubuntu", "py": "cp312", "arch": "x86_64", "cipy": "3.11"}
119+
- {"os": "ubuntu", "py": "cp313", "arch": "x86_64", "cipy": "3.11"}
120+
- {"os": "ubuntu", "py": "cp314", "arch": "x86_64", "cipy": "3.11"}
121+
- {"os": "ubuntu", "py": "cp310", "arch": "i686", "cipy": "3.11"}
122+
- {"os": "ubuntu", "py": "cp311", "arch": "i686", "cipy": "3.11"}
123+
- {"os": "ubuntu", "py": "cp312", "arch": "i686", "cipy": "3.11"}
124+
- {"os": "ubuntu", "py": "cp313", "arch": "i686", "cipy": "3.11"}
125+
- {"os": "ubuntu", "py": "cp314", "arch": "i686", "cipy": "3.11"}
126+
- {"os": "ubuntu", "py": "cp310", "arch": "aarch64", "cipy": "3.11", "os-version": "22.04-arm"}
127+
- {"os": "ubuntu", "py": "cp311", "arch": "aarch64", "cipy": "3.11", "os-version": "22.04-arm"}
128+
- {"os": "ubuntu", "py": "cp312", "arch": "aarch64", "cipy": "3.11", "os-version": "22.04-arm"}
129+
- {"os": "ubuntu", "py": "cp313", "arch": "aarch64", "cipy": "3.11", "os-version": "22.04-arm"}
130+
- {"os": "ubuntu", "py": "cp314", "arch": "aarch64", "cipy": "3.11", "os-version": "22.04-arm"}
131+
- {"os": "ubuntu", "py": "cp310", "arch": "riscv64", "cipy": "3.11"}
132+
- {"os": "ubuntu", "py": "cp311", "arch": "riscv64", "cipy": "3.11"}
133+
- {"os": "ubuntu", "py": "cp312", "arch": "riscv64", "cipy": "3.11"}
134+
- {"os": "ubuntu", "py": "cp313", "arch": "riscv64", "cipy": "3.11"}
135+
- {"os": "ubuntu", "py": "cp314", "arch": "riscv64", "cipy": "3.11"}
136+
- {"os": "macos", "py": "cp310", "arch": "arm64", "cipy": "3.11", "os-version": "14"}
137+
- {"os": "macos", "py": "cp311", "arch": "arm64", "cipy": "3.11", "os-version": "14"}
138+
- {"os": "macos", "py": "cp312", "arch": "arm64", "cipy": "3.11", "os-version": "14"}
139+
- {"os": "macos", "py": "cp313", "arch": "arm64", "cipy": "3.11", "os-version": "14"}
140+
- {"os": "macos", "py": "cp314", "arch": "arm64", "cipy": "3.11", "os-version": "14"}
141+
- {"os": "macos", "py": "cp310", "arch": "x86_64", "cipy": "3.11", "os-version": "14"}
142+
- {"os": "macos", "py": "cp311", "arch": "x86_64", "cipy": "3.11", "os-version": "14"}
143+
- {"os": "macos", "py": "cp312", "arch": "x86_64", "cipy": "3.11", "os-version": "14"}
144+
- {"os": "macos", "py": "cp313", "arch": "x86_64", "cipy": "3.11", "os-version": "14"}
145+
- {"os": "macos", "py": "cp314", "arch": "x86_64", "cipy": "3.11", "os-version": "14"}
146+
- {"os": "windows", "py": "cp310", "arch": "x86", "cipy": "3.11"}
147+
- {"os": "windows", "py": "cp311", "arch": "x86", "cipy": "3.11"}
148+
- {"os": "windows", "py": "cp312", "arch": "x86", "cipy": "3.11"}
149+
- {"os": "windows", "py": "cp313", "arch": "x86", "cipy": "3.11"}
150+
- {"os": "windows", "py": "cp314", "arch": "x86", "cipy": "3.11"}
151+
- {"os": "windows", "py": "cp310", "arch": "AMD64", "cipy": "3.11"}
152+
- {"os": "windows", "py": "cp311", "arch": "AMD64", "cipy": "3.11"}
153+
- {"os": "windows", "py": "cp312", "arch": "AMD64", "cipy": "3.11"}
154+
- {"os": "windows", "py": "cp313", "arch": "AMD64", "cipy": "3.11"}
155+
- {"os": "windows", "py": "cp314", "arch": "AMD64", "cipy": "3.11"}
156+
- {"os": "windows", "py": "cp311", "arch": "ARM64", "cipy": "3.11", "os-version": "11-arm"}
157+
- {"os": "windows", "py": "cp312", "arch": "ARM64", "cipy": "3.11", "os-version": "11-arm"}
158+
- {"os": "windows", "py": "cp313", "arch": "ARM64", "cipy": "3.11", "os-version": "11-arm"}
159+
- {"os": "windows", "py": "cp314", "arch": "ARM64", "cipy": "3.11", "os-version": "11-arm"}
160+
# [[[end]]] (sum: UDdYTxMoTi)
159161
# ^^^^^^^^^^^^^^^
160162
# If a check fails and points to this checksum line, it means you edited
161163
# the matrix directly instead of editing the Python code in the comment
@@ -173,7 +175,7 @@ jobs:
173175
- name: "Install Python"
174176
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
175177
with:
176-
python-version: "${{ matrix.minpy || '3.11' }}" # PYVERSIONS needed by cibuildwheel
178+
python-version: "${{ matrix.cipy }}"
177179
cache: pip
178180
cache-dependency-path: 'requirements/*.pip'
179181

‎.github/workflows/testsuite.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
6060
tests:
6161
name: "${{ matrix.python-version }} on ${{ matrix.os }}"
62-
runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
62+
runs-on: "${{ matrix.os }}-${{ matrix.os-version }}"
6363
timeout-minutes: 10
6464

6565
# Don't run tests if the branch name includes "-notests".
@@ -78,6 +78,8 @@ jobs:
7878
- ubuntu
7979
- macos
8080
- windows
81+
os-version:
82+
- latest
8183
python-version:
8284
# When changing this list, be sure to check the [gh] list in
8385
# tox.ini so that tox will run properly. PYVERSIONS

0 commit comments

Comments
 (0)