Skip to content

Update CI workflow to use Windows 2022 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreasbuhr merged 2 commits into from
Feb 26, 2026
Merged

Update CI workflow to use Windows 2022 #105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d04313
Update CI workflow to use Windows 2022
andreasbuhr Feb 26, 2026
0da3ad0
Fix condition for installing Msys2 on Windows
andreasbuhr Feb 26, 2026
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
33 changes: 22 additions & 11 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ jobs:
}
- {
name: "Windows MSVC 2017 (x64) C++17",
os: windows-2019,
os: windows-2022,
buildtype: Release,
cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat",
Expand All @@ -308,7 +308,7 @@ jobs:
}
- {
name: "Windows MSVC 2017 (x64) C++20",
os: windows-2019,
os: windows-2022,
buildtype: Release,
cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat",
Expand All @@ -317,15 +317,15 @@ jobs:
}
- {
name: "Windows MSVC 2019 (x64) C++17",
os: windows-2019,
os: windows-2022,
buildtype: Release,
cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
cxxver: 17,
}
- {
name: "Windows MSVC 2019 (x64) C++20",
os: windows-2019,
os: windows-2022,
buildtype: Release,
cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
Expand Down Expand Up @@ -375,7 +375,7 @@ jobs:
}
- {
name: "Msys2/CLANG",
os: windows-2019,
os: windows-2022,
buildtype: Release,
mingw: MINGW64,
mingw-arch: x86_64,
Expand All @@ -384,7 +384,7 @@ jobs:
}
- {
name: "Msys2/GCC",
os: windows-2019,
os: windows-2022,
buildtype: Release,
mingw: MINGW64,
mingw-arch: x86_64,
Expand All @@ -393,7 +393,7 @@ jobs:
}
- {
name: "Msys2/debugCLANG",
os: windows-2019,
os: windows-2022,
buildtype: Debug,
mingw: MINGW64,
mingw-arch: x86_64,
Expand All @@ -402,7 +402,7 @@ jobs:
}
- {
name: "Msys2/debugGCC",
os: windows-2019,
os: windows-2022,
buildtype: Debug,
mingw: MINGW64,
mingw-arch: x86_64,
Expand All @@ -414,7 +414,7 @@ jobs:
- uses: actions/checkout@v3

- name: "Install Msys2"
if: (startsWith(matrix.config.os, 'windows-2019') && contains(matrix.config.mingw, 'MINGW'))
if: (startsWith(matrix.config.os, 'windows-20') && contains(matrix.config.mingw, 'MINGW'))
uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.config.mingw }}
Expand Down Expand Up @@ -579,14 +579,25 @@ jobs:

- name: Install MSVC 2017
id: install_msvc_2017
if: startsWith(matrix.config.os, 'windows-2019') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2017 )
if: startsWith(matrix.config.os, 'windows-') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2017 )
shell: bash
working-directory: ${{ env.HOME }}
run: |
choco install visualstudio2017community
choco install visualstudio2017-workload-nativedesktop
choco install visualstudio2017-workload-vctools

- name: Install MSVC 2019
id: install_msvc_2019
if: startsWith(matrix.config.os, 'windows-') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2019 )
shell: bash
working-directory: ${{ env.HOME }}
run: |
choco feature disable --name="'exitOnRebootDetected'"
choco install visualstudio2019community
choco install visualstudio2019-workload-nativedesktop
choco install visualstudio2019-workload-vctools

- name: Install MSVC 2026 (Visual Studio 2026 Community with C++ tools)
id: install_msvc_2026
if: startsWith(matrix.config.os, 'windows-') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2026 )
Expand All @@ -599,7 +610,7 @@ jobs:

- name: MSYS2 - Configure, Build & Test
id: install_msys2
if: (startsWith(matrix.config.os, 'windows-2019') && contains(matrix.config.mingw, 'MINGW'))
if: (startsWith(matrix.config.os, 'windows-20') && contains(matrix.config.mingw, 'MINGW'))
shell: msys2 {0}
working-directory: ${{ env.HOME }}
run: |
Expand Down