Skip to content

Upgrade Windows build environment to 2022 #2468

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

Open
dcwhite wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade Windows build environment to 2022 #2468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1230a
Upgrade Windows build environment to 2022
dcwhite Apr 24, 2026
566ef76
Upgrade Visual Studio version to 17 2022
dcwhite Apr 24, 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
30 changes: 15 additions & 15 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
windows-build-headless:
runs-on: windows-2019
runs-on: windows-2022

steps:

Expand All @@ -21,7 +21,7 @@ jobs:
working-directory: bin
shell: cmd
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DBUILD_HEADLESS:BOOL=ON -DBUILD_WITH_PYTHON:BOOL=OFF -DBUILD_TESTING:BOOL=ON
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -DBUILD_HEADLESS:BOOL=ON -DBUILD_WITH_PYTHON:BOOL=OFF -DBUILD_TESTING:BOOL=ON

- name: Compile
working-directory: bin
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: cmake --build . --target RUN_TESTS --config Release

windows-build-gui-qt5:
runs-on: windows-2019
runs-on: windows-2022

steps:

Expand All @@ -102,7 +102,7 @@ jobs:
version: 5.15.2
target: desktop
host: windows
arch: win64_msvc2019_64
arch: win64_msvc2022_64
setup-python: 'true'
install-deps: true

Expand All @@ -112,7 +112,7 @@ jobs:
- name: Configure
working-directory: bin
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF

- name: Compile
working-directory: bin
Expand All @@ -133,7 +133,7 @@ jobs:
path: bin/SCIRun/SCIRun-5.0.*.exe

windows-build-gui-qt6:
runs-on: windows-2019
runs-on: windows-2022

steps:

Expand All @@ -150,7 +150,7 @@ jobs:
version: 6.3.*
target: desktop
host: windows
arch: win64_msvc2019_64
arch: win64_msvc2022_64
setup-python: 'true'
install-deps: true

Expand All @@ -160,7 +160,7 @@ jobs:
- name: Configure
working-directory: bin
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DSCIRUN_QT_MIN_VERSION:STRING="6.3.1" -DQt_PATH:PATH="$env:QT_ROOT_DIR" -DBUILD_WITH_PYTHON:BOOL=OFF
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -DSCIRUN_QT_MIN_VERSION:STRING="6.3.1" -DQt_PATH:PATH="$env:QT_ROOT_DIR" -DBUILD_WITH_PYTHON:BOOL=OFF

- name: Compile
working-directory: bin
Expand All @@ -181,7 +181,7 @@ jobs:
path: bin/SCIRun/SCIRun-5.0.*.exe

windows-build-gui-python:
runs-on: windows-2019
runs-on: windows-2022

steps:

Expand All @@ -198,14 +198,14 @@ jobs:
version: 5.15.2
target: desktop
host: windows
arch: win64_msvc2019_64
arch: win64_msvc2022_64
setup-python: 'true'
install-deps: true

- name: Configure
working-directory: bin
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir"
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir"

- name: Compile
working-directory: bin
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
# bin/SCIRun/SCIRun-5.0.beta.*-win64.exe

windows-build-gui-python-ospray:
runs-on: windows-2019
runs-on: windows-2022

steps:

Expand All @@ -254,14 +254,14 @@ jobs:
version: 5.15.2
target: desktop
host: windows
arch: win64_msvc2019_64
arch: win64_msvc2022_64
setup-python: 'true'
install-deps: true

- name: Configure
working-directory: bin
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir" -DWITH_OSPRAY:BOOL=ON
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -DQt_PATH:PATH="$env:Qt5_Dir" -DWITH_OSPRAY:BOOL=ON

- name: Compile
working-directory: bin
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
# runs-on: ${{ matrix.os }}
# strategy:
# matrix:
# os: [windows-2022, windows-2019]
# os: [windows-2022, windows-2022]
# qt: ["5.15.2", "6.3.1"]
# hl: ["ON", "OFF"]
# py: ["ON", "OFF"]
Expand Down
Loading