diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index 88d3cab178..13140f6aa8 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -92,7 +92,7 @@ jobs: run: | cd build ctest --extra-verbose --no-tests=error - windows-2022: + windows-2025: strategy: matrix: shared: [ @@ -103,7 +103,7 @@ jobs: "boost", "stdfs" ] - runs-on: windows-2022 + runs-on: windows-2025 steps: - uses: actions/checkout@v4 - name: Add MSVC to PATH @@ -117,7 +117,7 @@ jobs: run: | python -m pip install --upgrade pip pip install --upgrade conan - CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2022 \ + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2025 \ -o with_boost=${H5CPP_WITH_BOOST} \ -o shared=${H5CPP_SHARED} \ -o *:shared=${H5CPP_SHARED}" @@ -129,13 +129,13 @@ jobs: uses: actions/cache@v4 with: path: ~/.conan/data - key: conan-vs2022-${{ hashfiles('base.lock') }}-${{ hashFiles('conan.lock') }} + key: conan-vs2025-${{ hashfiles('base.lock') }}-${{ hashFiles('conan.lock') }} restore-keys: | - conan-vs-2022-${{ hashfiles('base.lock') }} - conan-vs-2022 + conan-vs-2025-${{ hashfiles('base.lock') }} + conan-vs-2025 - name: Install conan dependencies run: | - CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2022 \ + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2025 \ -o with_boost=${H5CPP_WITH_BOOST} \ -o shared=${H5CPP_SHARED} \ -o *:shared=${H5CPP_SHARED}" @@ -148,7 +148,7 @@ jobs: --generator VirtualRunEnv - name: Build with cmake run: | - CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2022 \ + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2025 \ -o with_boost=${H5CPP_WITH_BOOST} \ -o shared=${H5CPP_SHARED} \ -o *:shared=${H5CPP_SHARED}" diff --git a/.github/workflows/conan/profiles/vs2019 b/.github/workflows/conan/profiles/vs2019 deleted file mode 100644 index ec8c8613ae..0000000000 --- a/.github/workflows/conan/profiles/vs2019 +++ /dev/null @@ -1,10 +0,0 @@ -[settings] -arch=x86_64 -build_type=Release -compiler=msvc -compiler.version=192 -compiler.runtime=dynamic -os=Windows - -[conf] -tools.env.virtualenv:powershell=True diff --git a/.github/workflows/conan/profiles/vs2022 b/.github/workflows/conan/profiles/vs2025 similarity index 100% rename from .github/workflows/conan/profiles/vs2022 rename to .github/workflows/conan/profiles/vs2025 diff --git a/test/core/fixed_length_string_test.cpp b/test/core/fixed_length_string_test.cpp index d473a21441..0004570106 100644 --- a/test/core/fixed_length_string_test.cpp +++ b/test/core/fixed_length_string_test.cpp @@ -221,4 +221,4 @@ SCENARIO("testing reading of fixed-size string attributes") } } } -} \ No newline at end of file +}