Skip to content

Commit af41f9c

Browse files
authored
Switch to VS 2022 (#1598)
Align with the OpenVINO build, which has started using Visual Studio 2022 (openvinotoolkit/openvino#28520) **Note, merge after the PR above**
1 parent d3bf47b commit af41f9c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/workflows/stable_diffusion_1_5_cpp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153

154154
stable_diffusion_1_5_cpp-windows:
155155
needs: [ openvino_download_windows ]
156-
runs-on: windows-2019
156+
runs-on: windows-2022
157157
defaults:
158158
run:
159159
shell: pwsh

.github/workflows/windows.yml

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows (VS 2019, Python 3.11)
1+
name: Windows (VS 2022, Python 3.11)
22
on:
33
workflow_dispatch:
44
pull_request:
@@ -59,7 +59,7 @@ jobs:
5959
defaults:
6060
run:
6161
shell: pwsh
62-
runs-on: windows-2019-16-core
62+
runs-on: windows-2022-16-core
6363
env:
6464
CMAKE_BUILD_TYPE: 'Release'
6565
CMAKE_GENERATOR: 'Ninja Multi-Config'
@@ -121,6 +121,8 @@ jobs:
121121
122122
- name: Configure Developer Command Prompt for Microsoft Visual C++
123123
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
124+
with:
125+
toolset: 14.42 # v2022
124126

125127
- name: CMake configure - OpenVINO
126128
run: |
@@ -192,7 +194,7 @@ jobs:
192194
defaults:
193195
run:
194196
shell: pwsh
195-
runs-on: windows-2019
197+
runs-on: windows-2022
196198

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

229233
- name: Build genai libs
230234
run: |
@@ -257,7 +261,7 @@ jobs:
257261
defaults:
258262
run:
259263
shell: pwsh
260-
runs-on: windows-2019
264+
runs-on: windows-2022
261265

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

294300
- name: Build genai libs
295301
run: |
@@ -327,7 +333,7 @@ jobs:
327333
defaults:
328334
run:
329335
shell: pwsh
330-
runs-on: windows-2019-16-core
336+
runs-on: windows-2022-16-core
331337

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

364372
- name: Build genai libs
365373
run: |
@@ -388,7 +396,7 @@ jobs:
388396
defaults:
389397
run:
390398
shell: pwsh
391-
runs-on: windows-2019
399+
runs-on: windows-2022
392400

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

425435
- name: Build genai libs
426436
run: |

0 commit comments

Comments
 (0)