Skip to content

Commit d393c1b

Browse files
committed
added macos-15 to CI
1 parent a214e76 commit d393c1b

2 files changed

Lines changed: 23 additions & 9 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-22.04, macos-13]
23+
os: [ubuntu-22.04, macos-13, macos-15]
2424
fail-fast: false # Prefer quick result
2525

2626
runs-on: ${{ matrix.os }}
@@ -75,7 +75,7 @@ jobs:
7575

7676
strategy:
7777
matrix:
78-
os: [ubuntu-22.04, macos-13]
78+
os: [ubuntu-22.04, macos-13, macos-15]
7979
fail-fast: false # Prefer quick result
8080

8181
runs-on: ${{ matrix.os }}
@@ -155,7 +155,7 @@ jobs:
155155

156156
strategy:
157157
matrix:
158-
os: [ubuntu-22.04, macos-13]
158+
os: [ubuntu-22.04, macos-13, macos-15]
159159
fail-fast: false # Prefer quick result
160160

161161
runs-on: ${{ matrix.os }}
@@ -189,7 +189,7 @@ jobs:
189189

190190
strategy:
191191
matrix:
192-
os: [ubuntu-22.04, macos-13]
192+
os: [ubuntu-22.04, macos-13, macos-15]
193193
fail-fast: false # Prefer quick result
194194

195195
runs-on: ${{ matrix.os }}
@@ -223,7 +223,7 @@ jobs:
223223

224224
strategy:
225225
matrix:
226-
os: [ubuntu-22.04, macos-13]
226+
os: [ubuntu-22.04, macos-13, macos-15]
227227
fail-fast: false # Prefer quick result
228228

229229
runs-on: ${{ matrix.os }}
@@ -247,7 +247,7 @@ jobs:
247247

248248
strategy:
249249
matrix:
250-
os: [ubuntu-22.04, macos-13]
250+
os: [ubuntu-22.04, macos-13, macos-15]
251251
include:
252252
- xdist_n: auto
253253
# FIXME: test_color_tty fails with xdist
@@ -284,16 +284,30 @@ jobs:
284284
if: contains(matrix.os, 'macos')
285285
run: |
286286
# pcre was removed from runner images in November 2022
287-
brew install coreutils python3 pcre gnu-sed
287+
brew install coreutils pcre gnu-sed
288288
289-
- name: Install missing Python packages
289+
- name: Install missing Python packages on ubuntu
290+
if: contains(matrix.os, 'ubuntu')
290291
run: |
291292
python3 -m pip install pip --upgrade
292293
python3 -m pip install pytest
293294
python3 -m pip install pytest-timeout
294295
python3 -m pip install pytest-xdist
295296
python3 -m pip install psutil
296297
298+
# we need to use -break-system-packages --user because the common approaches do not work.
299+
# using pip works but it appears to install the packages into a different Python installation so they are not found later on.
300+
# using python3 -m pip without the additional flags fails since the packages are being managed by a different tool (brew) and that lacks some of the packages.
301+
# using pipx also does not work.
302+
- name: Install missing Python packages on macos
303+
if: contains(matrix.os, 'macos')
304+
run: |
305+
python3 -m pip install --break-system-packages --user pip --upgrade
306+
python3 -m pip install --break-system-packages --user pytest
307+
python3 -m pip install --break-system-packages --user pytest-timeout
308+
python3 -m pip install --break-system-packages --user pytest-xdist
309+
python3 -m pip install --break-system-packages --user psutil
310+
297311
- name: Build cppcheck
298312
run: |
299313
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"

.github/workflows/scriptcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
dmake:
204204
strategy:
205205
matrix:
206-
os: [ubuntu-22.04, macos-13, windows-2025]
206+
os: [ubuntu-22.04, macos-13, macos-15, windows-2025]
207207
fail-fast: false
208208

209209
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)