Skip to content

Commit 9cd2513

Browse files
authored
Merge pull request #1117 from asmorkalov:as/windows_env_update
Updated Windows build environment to 2025. 2019 - retired.
2 parents 8d6746c + 957adcf commit 9cd2513

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/build_wheels_windows.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
Build:
22-
runs-on: windows-2019
22+
runs-on: windows-2025
2323
strategy:
2424
fail-fast: false
2525
matrix:
@@ -48,7 +48,7 @@ jobs:
4848
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
4949
fi
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252
with:
5353
submodules: false
5454
fetch-depth: 0
@@ -79,7 +79,7 @@ jobs:
7979

8080
Test:
8181
needs: [Build]
82-
runs-on: windows-2019
82+
runs-on: windows-2025
8383
defaults:
8484
run:
8585
shell: cmd
@@ -95,6 +95,7 @@ jobs:
9595
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
9696
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
9797
PYLINT_TEST_FILE: ${{ github.workspace }}\opencv\samples\python\squares.py
98+
PlatformToolset: v143
9899
steps:
99100
- name: Cleanup
100101
shell: bash
@@ -103,7 +104,7 @@ jobs:
103104
rm -rf ./.??* || true
104105
working-directory: ${{ github.workspace }}
105106
- name: Checkout
106-
uses: actions/checkout@v3
107+
uses: actions/checkout@v4
107108
with:
108109
submodules: true
109110
fetch-depth: 0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def main():
163163
files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}
164164

165165
ci_cmake_generator = (
166-
["-G", "Visual Studio 14" + (" Win64" if is64 else "")]
166+
["-G", "Visual Studio 17 2022"]
167167
if os.name == "nt"
168168
else ["-G", "Unix Makefiles"]
169169
)

0 commit comments

Comments
 (0)