Merge pull request #4568 from vicentebolea/update-windows-imgs

ci: use windows 2022 and 2025

Author: vicentebolea

.github/workflows/everything.yml

@@ -361,22 +361,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [win2019, win2022]
+        os: [win2022, win2025]
         shared: [shared]
         parallel: [msmpi]
         include:
-          - os: win2019
-            image: windows-2019
-            compiler: vs2019
           - os: win2022
             image: windows-2022
             compiler: vs2022
-          - os: win2022
-            image: windows-2022
+          - os: win2025
+            image: windows-2025
+            compiler: vs2022
+          - os: win2025
+            image: windows-2025
             compiler: vs2022
             parallel: serial
-          - os: win2022
-            image: windows-2022
+          - os: win2025
+            image: windows-2025
             shared: static
             compiler: vs2022
             parallel: serial

scripts/ci/cmake/ci-win2022-vs2022-msmpi.cmake

@@ -10,15 +10,14 @@ ADIOS2_BUILD_EXAMPLES:BOOL=ON
 ADIOS2_USE_BZip2:BOOL=OFF
 ADIOS2_USE_Fortran:BOOL=OFF
 ADIOS2_USE_MPI:BOOL=ON
-ADIOS2_USE_HDF5:STRING=ON
-ADIOS2_USE_HDF5_VOL:STRING=OFF
 ADIOS2_USE_Python:BOOL=ON
 
 Python_ROOT_DIR:PATH=$ENV{CMAKE_PREFIX_PATH}
 Python_FIND_STRATEGY:STRING=LOCATION
 Python_FIND_FRAMEWORK:STRING=FIRST
 ")
 
+set(CTEST_TEST_TIMEOUT 500)
 set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
 set(CTEST_CMAKE_GENERATOR_PLATFORM "x64")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

scripts/ci/cmake/ci-win2019-vs2019-msmpi.cmake renamed to scripts/ci/cmake/ci-win2025-vs2022-msmpi.cmake

@@ -10,15 +10,16 @@ ADIOS2_BUILD_EXAMPLES:BOOL=ON
 ADIOS2_USE_BZip2:BOOL=OFF
 ADIOS2_USE_Fortran:BOOL=OFF
 ADIOS2_USE_MPI:BOOL=ON
+ADIOS2_USE_HDF5:STRING=ON
+ADIOS2_USE_HDF5_VOL:STRING=OFF
 ADIOS2_USE_Python:BOOL=ON
 
 Python_ROOT_DIR:PATH=$ENV{CMAKE_PREFIX_PATH}
 Python_FIND_STRATEGY:STRING=LOCATION
 Python_FIND_FRAMEWORK:STRING=FIRST
 ")
 
-set(CTEST_TEST_TIMEOUT 500)
-set(CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
 set(CTEST_CMAKE_GENERATOR_PLATFORM "x64")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 # https://github.com/ornladios/ADIOS2/issues/4276