Skip to content

Commit ff47958

Browse files
committed
added macos-14 to CI
1 parent 1869eca commit ff47958

2 files changed

Lines changed: 22 additions & 9 deletions

File tree

.github/workflows/CI-unixish.yml

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

2121
strategy:
2222
matrix:
23-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
23+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
2424
include:
2525
- use_qt6: On
2626
- os: ubuntu-20.04
@@ -85,7 +85,7 @@ jobs:
8585

8686
strategy:
8787
matrix:
88-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
88+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
8989
include:
9090
- use_qt6: On
9191
- os: ubuntu-20.04
@@ -169,7 +169,7 @@ jobs:
169169

170170
strategy:
171171
matrix:
172-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
172+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
173173
fail-fast: false # Prefer quick result
174174

175175
runs-on: ${{ matrix.os }}
@@ -203,7 +203,7 @@ jobs:
203203

204204
strategy:
205205
matrix:
206-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
206+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
207207
fail-fast: false # Prefer quick result
208208

209209
runs-on: ${{ matrix.os }}
@@ -237,7 +237,7 @@ jobs:
237237

238238
strategy:
239239
matrix:
240-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
240+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
241241
fail-fast: false # Prefer quick result
242242

243243
runs-on: ${{ matrix.os }}
@@ -261,7 +261,7 @@ jobs:
261261

262262
strategy:
263263
matrix:
264-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
264+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
265265
fail-fast: false # Prefer quick result
266266

267267
runs-on: ${{ matrix.os }}
@@ -293,15 +293,28 @@ jobs:
293293
if: contains(matrix.os, 'macos')
294294
run: |
295295
# pcre was removed from runner images in November 2022
296-
brew install coreutils python3 pcre gnu-sed
296+
brew install coreutils pcre gnu-sed
297297
298-
- name: Install missing Python packages
298+
- name: Install missing Python packages on ubuntu
299+
if: contains(matrix.os, 'ubuntu')
299300
run: |
300301
python3 -m pip install pip --upgrade
301302
python3 -m pip install pytest
302303
python3 -m pip install pytest-timeout
303304
python3 -m pip install psutil
304305
306+
# we need to use -break-system-packages --user because the common approaches do not work.
307+
# using pip works but it appears to install the packages into a different Python installation so they are not found later on.
308+
# 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.
309+
# using pipx also does not work.
310+
- name: Install missing Python packages on macos
311+
if: contains(matrix.os, 'macos')
312+
run: |
313+
python3 -m pip install --break-system-packages --user pip --upgrade
314+
python3 -m pip install --break-system-packages --user pytest
315+
python3 -m pip install --break-system-packages --user pytest-timeout
316+
python3 -m pip install --break-system-packages --user psutil
317+
305318
- name: Build cppcheck
306319
run: |
307320
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
@@ -190,7 +190,7 @@ jobs:
190190
dmake:
191191
strategy:
192192
matrix:
193-
os: [ubuntu-22.04, macos-13, windows-2022]
193+
os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
194194
fail-fast: false
195195

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

0 commit comments

Comments
 (0)