Skip to content

Commit e3fd719

Browse files
committed
added macos-14 to CI
1 parent 61b75e6 commit e3fd719

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 14 additions & 6 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
@@ -83,7 +83,7 @@ jobs:
8383

8484
strategy:
8585
matrix:
86-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
86+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
8787
include:
8888
- use_qt6: On
8989
- os: ubuntu-20.04
@@ -165,7 +165,7 @@ jobs:
165165

166166
strategy:
167167
matrix:
168-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
168+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
169169
fail-fast: false # Prefer quick result
170170

171171
runs-on: ${{ matrix.os }}
@@ -197,7 +197,7 @@ jobs:
197197

198198
strategy:
199199
matrix:
200-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
200+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
201201
fail-fast: false # Prefer quick result
202202

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

230230
strategy:
231231
matrix:
232-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
232+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
233233
fail-fast: false # Prefer quick result
234234

235235
runs-on: ${{ matrix.os }}
@@ -251,7 +251,7 @@ jobs:
251251

252252
strategy:
253253
matrix:
254-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
254+
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
255255
fail-fast: false # Prefer quick result
256256

257257
runs-on: ${{ matrix.os }}
@@ -284,12 +284,20 @@ jobs:
284284
brew install coreutils python3 pcre gnu-sed
285285
286286
- name: Install missing Python packages
287+
if: matrix.os == 'macos-13'
287288
run: |
288289
python3 -m pip install pip --upgrade
289290
python3 -m pip install pytest
290291
python3 -m pip install pytest-timeout
291292
python3 -m pip install psutil
292293
294+
- name: Install missing Python packages (macos)
295+
if: matrix.os == 'macos-14'
296+
run: |
297+
pipx install pytest
298+
pipx install pytest-timeout
299+
pipx install psutil
300+
293301
- name: Build cppcheck
294302
run: |
295303
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
@@ -186,7 +186,7 @@ jobs:
186186
dmake:
187187
strategy:
188188
matrix:
189-
os: [ubuntu-22.04, macos-13, windows-2022]
189+
os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
190190
fail-fast: false
191191

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

0 commit comments

Comments
 (0)