Skip to content

Commit bbb9f44

Browse files
authored
Merge pull request #5071 from vicentebolea/ci-fixes-combined
ci: fix Windows 2025 jobs (vs2026) and pin cibuildwheel v3
2 parents 71f9f16 + 0d564b1 commit bbb9f44

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/everything.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ jobs:
371371
needs: [format, git_checks]
372372
if: needs.git_checks.outputs.num_code_changes > 0
373373

374-
runs-on: ${{ matrix.image }}
374+
runs-on: ${{ matrix.image }}${{ matrix.compiler == 'vs2026' && '-vs2026' || ''}}
375375
env:
376376
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
377377
GH_YML_BASE_OS: Windows
@@ -391,15 +391,15 @@ jobs:
391391
compiler: vs2022
392392
- os: win2025
393393
image: windows-2025
394-
compiler: vs2022
394+
compiler: vs2026
395395
- os: win2025
396396
image: windows-2025
397-
compiler: vs2022
397+
compiler: vs2026
398398
parallel: serial
399399
- os: win2025
400400
image: windows-2025
401401
shared: static
402-
compiler: vs2022
402+
compiler: vs2026
403403
parallel: serial
404404

405405
defaults:

.github/workflows/pypackaging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
fetch-depth: 0
7575
- name: Generate common version file
7676
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
77-
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
77+
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
7878
env:
7979
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
8080
CIBW_BUILD: >-
@@ -98,7 +98,7 @@ jobs:
9898
fetch-depth: 0
9999
- name: Generate common version file
100100
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
101-
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
101+
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
102102
env:
103103
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
104104
# abi3 wheel valid for all CPython >= 3.12 (enabled via pyproject.toml override)
@@ -120,7 +120,7 @@ jobs:
120120
fetch-depth: 0
121121
- name: Generate common version file
122122
run: cmake -P scripts/ci/gh-actions/config/adios-version.cmake && echo VERSION.TXT
123-
- uses: pypa/cibuildwheel@f03ac7617d6cff873ccf24cc0d567ef5ba5a9e6d # v4.0.0
123+
- uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
124124
env:
125125
CIBW_BEFORE_ALL: yum install -y libcurl-devel openssl-devel
126126
# free-threaded and prerelease are both opt-in groups in cibuildwheel;

scripts/ci/cmake/ci-win2025-vs2022-msmpi.cmake renamed to scripts/ci/cmake/ci-win2025-vs2026-msmpi.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Python_FIND_STRATEGY:STRING=LOCATION
2323
Python_FIND_FRAMEWORK:STRING=FIRST
2424
")
2525

26-
set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
26+
set(CTEST_CMAKE_GENERATOR "Visual Studio 18 2026")
2727
set(CTEST_CMAKE_GENERATOR_PLATFORM "x64")
2828
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
2929
# https://github.com/ornladios/ADIOS2/issues/4276

scripts/ci/cmake/ci-win2025-vs2022-serial.cmake renamed to scripts/ci/cmake/ci-win2025-vs2026-serial.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Python_FIND_STRATEGY:STRING=LOCATION
2626
Python_FIND_FRAMEWORK:STRING=FIRST
2727
")
2828

29-
set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
29+
set(CTEST_CMAKE_GENERATOR "Visual Studio 18 2026")
3030
set(CTEST_CMAKE_GENERATOR_PLATFORM "x64")
3131
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
3232
# https://github.com/ornladios/ADIOS2/issues/4276

scripts/ci/cmake/ci-win2025-vs2022-static-serial.cmake renamed to scripts/ci/cmake/ci-win2025-vs2026-static-serial.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ADIOS2_USE_Python:BOOL=OFF
2727
ADIOS2_USE_HDF5_VOL:STRING=OFF
2828
")
2929

30-
set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
30+
set(CTEST_CMAKE_GENERATOR "Visual Studio 18 2026")
3131
set(CTEST_CMAKE_GENERATOR_PLATFORM "x64")
3232
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
3333
include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

0 commit comments

Comments
 (0)