Skip to content

Commit a9dfa1d

Browse files
committed
shift CI off of macos-13 and (for macOS) Qt 5.x
1 parent 88a19fb commit a9dfa1d

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/tests.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
- { os: ubuntu-22.04, gcc: 9, python: 3.9 }
2424
- { os: ubuntu-24.04, gcc: 12, python: 3.12 }
2525
# macOS, oldest supported version
26-
# (macos-10.15, macos-11, and macos-12 were removed by GitHub)
27-
- { os: macos-13, python: 3.9 }
26+
# (macos-10.15, macos-11, macos-12, and macos-13 were removed by GitHub)
27+
- { os: macos-14, python: 3.9 }
2828
# macOS, newest supported version
29-
- { os: macos-15, python: 3.12 }
29+
- { os: macos-26, python: 3.13 }
3030

3131
runs-on: ${{ matrix.os }}
3232
steps:
@@ -197,13 +197,16 @@ jobs:
197197
- { os: ubuntu-22.04, qt: 5.15.2, gcc: 12 }
198198
# Ubuntu 24.04 with the most recent Qt6 and GCC.
199199
- { os: ubuntu-22.04, qt: 6.8.2, gcc: 12 }
200-
# old macOS with oldest supported Qt5; macos-12 was removed by GitHub,
201-
# so we can't CI with Qt 5.9.5 any more, oh well
202-
#- {os: macos-12, qt: 5.9.5}
200+
# macos-12 and macos-13 were removed by GitHub,
201+
# so we can't CI with Qt 5.X on macOS any more, oh well
203202
# old macOS with last official LTS Qt5
204-
- { os: macos-13, qt: 5.15.2 }
205-
# new macOS with most recent Qt6
206-
- { os: macos-15, qt: 6.8.2 }
203+
#- { os: macos-13, qt: 5.15.2 }
204+
# old macOS ARM64 with older Qt6
205+
- { os: macos-14, qt: 6.7.3 }
206+
# macOS Intel with older Qt6
207+
- { os: macos-15-intel, qt: 6.7.3 }
208+
# new macOS with most recent Qt6 LTS
209+
- { os: macos-26, qt: 6.8.3 }
207210
runs-on: ${{ matrix.os }}
208211
env:
209212
CXXFLAGS: -D NO_QT_VERSION_ERROR

VERSIONS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ development head (in the master branch):
2121
fix #579, crash in models with (a) tree-seq recording, (b) multiple chromosomes, AND (c) rejection of proposed offspring in modifyChild()
2222
add readLine() function for obtaining stdin input to running models, thanks to Chris Talbot
2323
fix #580, add isClose() and allClose() Eidos functions for comparison within a given tolerance
24+
shift to macOS 14 as the oldest supported macOS version in GitHub Actions; we no longer test on macOS 13, or with Qt 5.x on macOS (but Qt 5.x still gets tested on other platforms, for now)
2425

2526

2627
version 5.1 (Eidos version 4.1):

0 commit comments

Comments
 (0)