Skip to content

Commit 41e01d3

Browse files
committed
build: use macos 13 for 3.8 and 3.9 while GitHub rolls out macos 14
1 parent 583f0c0 commit 41e01d3

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

.github/workflows/coverage.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ concurrency:
3030
jobs:
3131
coverage:
3232
name: "${{ matrix.python-version }} on ${{ matrix.os }}"
33-
runs-on: "${{ matrix.os }}-latest"
33+
runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
3434
env:
3535
MATRIX_ID: "${{ matrix.python-version }}.${{ matrix.os }}"
3636

@@ -69,6 +69,15 @@ jobs:
6969
python-version: "pypy-3.9"
7070
- os: windows
7171
python-version: "pypy-3.10"
72+
# GitHub is rolling out macos 14, but it doesn't have Python 3.8 or 3.9.
73+
# https://mastodon.social/@hugovk/112320493602782374
74+
include:
75+
- python-version: "3.8"
76+
os: "macos"
77+
os-version: "13"
78+
- python-version: "3.9"
79+
os: "macos"
80+
os-version: "13"
7281
# If one job fails, stop the whole thing.
7382
fail-fast: true
7483

.github/workflows/kit.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ concurrency:
4848
jobs:
4949
wheels:
5050
name: "${{ matrix.py }} ${{ matrix.os }} ${{ matrix.arch }} wheels"
51-
runs-on: ${{ matrix.os }}-latest
51+
runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
5252
env:
5353
MATRIX_ID: "${{ matrix.py }}-${{ matrix.os }}-${{ matrix.arch }}"
5454
strategy:
@@ -84,7 +84,7 @@ jobs:
8484
#
8585
# # Some OS/arch combinations need overrides for the Python versions:
8686
# os_arch_pys = {
87-
# ("macos", "arm64"): ["cp38", "cp39", "cp310", "cp311", "cp312"],
87+
# # ("macos", "arm64"): ["cp38", "cp39", "cp310", "cp311", "cp312"],
8888
# }
8989
#
9090
# #----- ^^^ ---------------------- ^^^ -----
@@ -98,6 +98,8 @@ jobs:
9898
# "py": the_py,
9999
# "arch": the_arch,
100100
# }
101+
# if the_os == "macos":
102+
# them["os-version"] = "13"
101103
# print(f"- {json.dumps(them)}")
102104
# ]]]
103105
- {"os": "ubuntu", "py": "cp38", "arch": "x86_64"}
@@ -115,16 +117,16 @@ jobs:
115117
- {"os": "ubuntu", "py": "cp310", "arch": "aarch64"}
116118
- {"os": "ubuntu", "py": "cp311", "arch": "aarch64"}
117119
- {"os": "ubuntu", "py": "cp312", "arch": "aarch64"}
118-
- {"os": "macos", "py": "cp38", "arch": "arm64"}
119-
- {"os": "macos", "py": "cp39", "arch": "arm64"}
120-
- {"os": "macos", "py": "cp310", "arch": "arm64"}
121-
- {"os": "macos", "py": "cp311", "arch": "arm64"}
122-
- {"os": "macos", "py": "cp312", "arch": "arm64"}
123-
- {"os": "macos", "py": "cp38", "arch": "x86_64"}
124-
- {"os": "macos", "py": "cp39", "arch": "x86_64"}
125-
- {"os": "macos", "py": "cp310", "arch": "x86_64"}
126-
- {"os": "macos", "py": "cp311", "arch": "x86_64"}
127-
- {"os": "macos", "py": "cp312", "arch": "x86_64"}
120+
- {"os": "macos", "py": "cp38", "arch": "arm64", "os-version": "13"}
121+
- {"os": "macos", "py": "cp39", "arch": "arm64", "os-version": "13"}
122+
- {"os": "macos", "py": "cp310", "arch": "arm64", "os-version": "13"}
123+
- {"os": "macos", "py": "cp311", "arch": "arm64", "os-version": "13"}
124+
- {"os": "macos", "py": "cp312", "arch": "arm64", "os-version": "13"}
125+
- {"os": "macos", "py": "cp38", "arch": "x86_64", "os-version": "13"}
126+
- {"os": "macos", "py": "cp39", "arch": "x86_64", "os-version": "13"}
127+
- {"os": "macos", "py": "cp310", "arch": "x86_64", "os-version": "13"}
128+
- {"os": "macos", "py": "cp311", "arch": "x86_64", "os-version": "13"}
129+
- {"os": "macos", "py": "cp312", "arch": "x86_64", "os-version": "13"}
128130
- {"os": "windows", "py": "cp38", "arch": "x86"}
129131
- {"os": "windows", "py": "cp39", "arch": "x86"}
130132
- {"os": "windows", "py": "cp310", "arch": "x86"}
@@ -135,7 +137,7 @@ jobs:
135137
- {"os": "windows", "py": "cp310", "arch": "AMD64"}
136138
- {"os": "windows", "py": "cp311", "arch": "AMD64"}
137139
- {"os": "windows", "py": "cp312", "arch": "AMD64"}
138-
# [[[end]]] (checksum: a6ca53e9c620c9e5ca85e7322122056c)
140+
# [[[end]]] (checksum: 16ed28c185d540b2d9972a0217864472)
139141
fail-fast: false
140142

141143
steps:

.github/workflows/quality.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
# Because pylint can report different things on different OS's (!)
3232
# (https://github.com/PyCQA/pylint/issues/3489), run this on Mac where local
3333
# pylint gets run.
34-
runs-on: macos-latest
34+
# GitHub is rolling out macos 14, but it doesn't have Python 3.8 or 3.9.
35+
# https://mastodon.social/@hugovk/112320493602782374
36+
runs-on: macos-13
3537

3638
steps:
3739
- name: "Check out the repo"

.github/workflows/testsuite.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ concurrency:
3030
jobs:
3131
tests:
3232
name: "${{ matrix.python-version }} on ${{ matrix.os }}"
33-
runs-on: "${{ matrix.os }}-latest"
33+
runs-on: "${{ matrix.os }}-${{ matrix.os-version || 'latest' }}"
3434
# Don't run tests if the branch name includes "-notests"
3535
if: "!contains(github.ref, '-notests')"
3636
strategy:
@@ -62,6 +62,16 @@ jobs:
6262
python-version: "pypy-3.9"
6363
- os: windows
6464
python-version: "pypy-3.10"
65+
# GitHub is rolling out macos 14, but it doesn't have Python 3.8 or 3.9.
66+
# https://mastodon.social/@hugovk/112320493602782374
67+
include:
68+
- python-version: "3.8"
69+
os: "macos"
70+
os-version: "13"
71+
- python-version: "3.9"
72+
os: "macos"
73+
os-version: "13"
74+
6575
fail-fast: false
6676

6777
steps:

0 commit comments

Comments
 (0)