Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/windows-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ runs:
cd cpp
mkdir build-win
cd build-win
if min==${{ inputs.version }} (
if "${{ inputs.version }}"=="min" (
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
) else (
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
)
cmake --version
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=${{ inputs.config }} -DMEMILIO_USE_BUNDLED_JSONCPP=${{ inputs.optional-dependencies }} -DHDF5_USE_STATIC_LIBRARIES=ON -DHDF5_DIR="C:\HDF5\cmake" ..
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "windows-2025"
os: "windows-2025-vs2026"
- version: "min"
os: "windows-2022"
runs-on: ${{ matrix.os }}
Expand All @@ -114,7 +114,7 @@ jobs:

build-cpp-msvc-no-optional-deps:
if: github.event.pull_request.draft == false
runs-on: windows-2025
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/windows-build
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "windows-2025"
os: "windows-2025-vs2026"
- version: "min"
os: "windows-2022"
runs-on: ${{ matrix.os }}
Expand All @@ -244,7 +244,7 @@ jobs:
test-cpp-msvc-no-optional-deps:
if: github.event.pull_request.draft == false
needs: build-cpp-msvc-no-optional-deps
runs-on: windows-2025
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@v6
- uses: ./.github/actions/windows-test
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
version: ["latest", "min"]
include:
- version: "latest"
os: "windows-2025"
os: "windows-2025-vs2026"
- version: "min"
os: "windows-2022"
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-2025-vs2026]

steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MEmilio C++ uses CMake as a build configuration system (https://cmake.org/)
MEmilio C++ is regularly tested with the following compilers (list will be extended over time):
- GCC, versions 11 and 13
- Clang, version 14 and 17
- MSVC, version 19.43 (Visual Studio 2022)
- MSVC, versions 19.44+ (Visual Studio 2022) and 19.51+ (Visual Studio 2026)

MEmilio C++ is regularly tested on gitlub runners using Ubuntu 22.04 and 24.04 and Windows Server 2022 and 2025. It is expected to run on any comparable Linux or Windows system. It is currently not tested on MacOS.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/cpp/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ MEmilio C++ is regularly tested with the following compilers (list will be exten

- GCC, versions 11 and 13
- Clang, version 14 and 17
- MSVC, version 19.43 (Visual Studio 2022)
- MSVC, versions 19.44+ (Visual Studio 2022) and 19.51+ (Visual Studio 2026)

MEmilio C++ is regularly tested on GitHub runners using Ubuntu 22.04 and 24.04 and Windows Server 2022 and 2025. It is
expected to run on any comparable Linux or Windows system. It is currently not tested on macOS.
Expand Down
Loading