Skip to content

Commit

Permalink
Switch to VS 2022 (#1598)
Browse files Browse the repository at this point in the history
Align with the OpenVINO build, which has started using Visual Studio
2022 (openvinotoolkit/openvino#28520)

**Note, merge after the PR above**
  • Loading branch information
mryzhov authored Jan 22, 2025
1 parent d3bf47b commit af41f9c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stable_diffusion_1_5_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:

stable_diffusion_1_5_cpp-windows:
needs: [ openvino_download_windows ]
runs-on: windows-2019
runs-on: windows-2022
defaults:
run:
shell: pwsh
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Windows (VS 2019, Python 3.11)
name: Windows (VS 2022, Python 3.11)
on:
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-2019-16-core
runs-on: windows-2022-16-core
env:
CMAKE_BUILD_TYPE: 'Release'
CMAKE_GENERATOR: 'Ninja Multi-Config'
Expand Down Expand Up @@ -121,6 +121,8 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.42 # v2022

- name: CMake configure - OpenVINO
run: |
Expand Down Expand Up @@ -192,7 +194,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-2019
runs-on: windows-2022

env:
OV_INSTALL_DIR: ${{ github.workspace }}\\ov
Expand Down Expand Up @@ -225,6 +227,8 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.42 # v2022

- name: Build genai libs
run: |
Expand Down Expand Up @@ -257,7 +261,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-2019
runs-on: windows-2022

env:
OV_INSTALL_DIR: ${{ github.workspace }}\\ov
Expand Down Expand Up @@ -290,6 +294,8 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.42 # v2022

- name: Build genai libs
run: |
Expand Down Expand Up @@ -327,7 +333,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-2019-16-core
runs-on: windows-2022-16-core

env:
OV_INSTALL_DIR: ${{ github.workspace }}\\ov
Expand Down Expand Up @@ -360,6 +366,8 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.42 # v2022

- name: Build genai libs
run: |
Expand Down Expand Up @@ -388,7 +396,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: windows-2019
runs-on: windows-2022

env:
OV_INSTALL_DIR: ${{ github.workspace }}\\ov
Expand Down Expand Up @@ -421,6 +429,8 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.42 # v2022

- name: Build genai libs
run: |
Expand Down

0 comments on commit af41f9c

Please sign in to comment.