Skip to content

Commit 26fe250

Browse files
authored
Merge branch 'master' into fix-relative-paths2
2 parents b90d5c5 + 62afdd0 commit 26fe250

2 files changed

Lines changed: 3 additions & 20 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
compiler: [clang++, g++]
11-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
11+
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15]
1212
fail-fast: false
1313

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

.github/workflows/CI-windows.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
build:
1616
strategy:
1717
matrix:
18-
os: [windows-2019, windows-2022]
18+
os: [windows-2022, windows-2025]
1919
config: [Release, Debug]
2020
fail-fast: false
2121

@@ -27,24 +27,7 @@ jobs:
2727
- name: Setup msbuild.exe
2828
uses: microsoft/setup-msbuild@v2
2929

30-
- name: Set up Python 3.13
31-
uses: actions/setup-python@v5
32-
with:
33-
python-version: '3.13'
34-
check-latest: true
35-
36-
- name: Install missing Python packages
37-
run: |
38-
python -m pip install pip --upgrade || exit /b !errorlevel!
39-
python -m pip install pytest || exit /b !errorlevel!
40-
41-
- name: Run cmake
42-
if: matrix.os == 'windows-2019'
43-
run: |
44-
cmake -G "Visual Studio 16 2019" -A x64 . || exit /b !errorlevel!
45-
46-
- name: Run cmake
47-
if: matrix.os == 'windows-2022'
30+
- name: Run CMake
4831
run: |
4932
cmake -G "Visual Studio 17 2022" -A x64 . || exit /b !errorlevel!
5033

0 commit comments

Comments
 (0)