Skip to content

Commit 8ea9bb6

Browse files
committed
CI: run macOS GitHub Actions on macOS 13 on amd64
actions/setup-python do not support Python 3.7 on macOS on arm64. The latest macOS version available is macOS 14 but it is arm64 only. Stick to macos-13 as long as we want to test Python 3.7 on macOS. macOS 14 on arm64 is covered by the Cirrus CI jobs.
1 parent 139bbb1 commit 8ea9bb6

File tree

1 file changed

+26
-21
lines changed

1 file changed

+26
-21
lines changed

.github/workflows/tests.yml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ concurrency:
3636

3737
jobs:
3838
test:
39-
runs-on: ${{ matrix.os }}-latest
39+
runs-on: ${{ matrix.os }}
4040
strategy:
4141
fail-fast: false
4242
matrix:
4343
os:
44-
- ubuntu
45-
- macos
46-
- windows
44+
- ubuntu-latest
45+
# actions/setup-python do not support Python 3.7 on macOS on
46+
# arm64. The latest macOS version available is macOS 14 but
47+
# it is arm64 only. Stick to macos-13 as long as we want to
48+
# test Python 3.7 on macOS. macOS 14 on arm64 is covered by
49+
# the Cirrus CI jobs.
50+
- macos-13
51+
- windows-latest
4752
python:
4853
- '3.7'
4954
- '3.12'
@@ -52,46 +57,46 @@ jobs:
5257
pyproject_metadata:
5358
-
5459
include:
55-
- os: ubuntu
60+
- os: ubuntu-latest
5661
python: 'pypy-3.9'
57-
- os: ubuntu
62+
- os: ubuntu-latest
5863
python: 'pypy-3.10'
59-
- os: ubuntu
64+
- os: ubuntu-latest
6065
python: '3.8'
61-
- os: ubuntu
66+
- os: ubuntu-latest
6267
python: '3.9'
63-
- os: ubuntu
68+
- os: ubuntu-latest
6469
python: '3.10'
6570
# Test with older supported Meson version. Meson up to
6671
# version 1.2.3 requires distutils, which has been removed
6772
# from the stdlib in Python 3.12, thus test with Pythn 3.11.
68-
- os: ubuntu
73+
- os: ubuntu-latest
6974
python: '3.11'
7075
meson: '~=0.63.3'
71-
- os: ubuntu
76+
- os: ubuntu-latest
7277
python: '3.11'
7378
meson: '~=0.64.0'
74-
- os: ubuntu
79+
- os: ubuntu-latest
7580
python: '3.11'
7681
meson: '~=1.0.0'
77-
- os: ubuntu
82+
- os: ubuntu-latest
7883
python: '3.11'
7984
meson: '~=1.1.0'
80-
- os: ubuntu
85+
- os: ubuntu-latest
8186
python: '3.12'
8287
meson: '~=1.2.3'
83-
- os: ubuntu
88+
- os: ubuntu-latest
8489
python: '3.12'
8590
meson: '~=1.3'
8691
# Test with Meson master branch.
87-
- os: ubuntu
92+
- os: ubuntu-latest
8893
python: '3.12'
8994
meson: '@git+https://github.com/mesonbuild/meson.git'
90-
- os: windows
95+
- os: windows-latest
9196
python: '3.12'
9297
meson: '@git+https://github.com/mesonbuild/meson.git'
9398
# Test with oldest supported pyproject-metadata
94-
- os: ubuntu
99+
- os: ubuntu-latest
95100
python: '3.12'
96101
pyproject_metadata: '==0.7.1'
97102

@@ -106,15 +111,15 @@ jobs:
106111

107112
- name: Install Ninja
108113
run: sudo apt-get install ninja-build
109-
if: ${{ matrix.os == 'ubuntu' }}
114+
if: ${{ runner.os == 'Linux' }}
110115

111116
- name: Install Ninja
112117
run: brew install ninja
113-
if: ${{ matrix.os == 'macos' }}
118+
if: ${{ runner.os == 'macOS' }}
114119

115120
- name: Install Ninja
116121
run: python -m pip install ninja
117-
if: ${{ matrix.os == 'windows' }}
122+
if: ${{ runner.os == 'Windows' }}
118123

119124
- name: Install Meson
120125
run: python -m pip install "meson ${{ matrix.meson }}"

0 commit comments

Comments
 (0)