-
Notifications
You must be signed in to change notification settings - Fork 910
Move to windows-2025 Visual Studio -> 17 and update submodules #1105
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.
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
avdivan
wants to merge
111
commits into
opencv:4.x
Choose a base branch
from
avdivan:4.x
base: 4.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
111 commits
Select commit
Hold shift + click to select a range
5b68552
Update build_wheels_windows.yml
avdivan 0ed6932
Update build_wheels_windows.yml
avdivan 43df361
Update build_wheels_windows.yml
avdivan 800c408
Update build_wheels_windows.yml
avdivan d509950
Update build_wheels_windows.yml
avdivan 81b57ad
Update build_wheels_windows.yml
avdivan cf6f2a1
Update build_wheels_windows.yml
avdivan ce9020f
Update build_wheels_windows.yml
avdivan 5da97ac
Update build_wheels_windows.yml
avdivan 02ffc4a
Update build_wheels_windows.yml
avdivan 62aa42c
Update build_wheels_windows.yml
avdivan 3f50ff6
Update build_wheels_windows.yml
avdivan 24e5192
Update build_wheels_windows.yml
avdivan af76f7a
Update setup.py
avdivan 8e63c5b
Update setup.py
avdivan 67bf0aa
Update build_wheels_windows.yml
avdivan 66d74ac
Update build_wheels_windows.yml
avdivan 355cef3
Update build_wheels_windows.yml
avdivan 5e3b12b
Update build_wheels_windows.yml
avdivan 42f1137
Update build_wheels_windows.yml
avdivan 24eb050
Update build_wheels_windows.yml
avdivan 757388d
Update build_wheels_windows.yml
avdivan 670397e
Update build_wheels_windows.yml
avdivan 4204e30
Update setup.py
avdivan addeb8d
Update build_wheels_windows.yml
avdivan ef3b720
Update build_wheels_windows.yml
avdivan b3190f6
Update build_wheels_windows.yml
avdivan ee04bc6
Update build_wheels_windows.yml
avdivan 83443a5
Update build_wheels_windows.yml
avdivan bb83796
Update build_wheels_windows.yml
avdivan b3c51cf
Update build_wheels_windows.yml
avdivan 4c78354
Update build_wheels_windows.yml
avdivan 067d7f3
Update build_wheels_windows.yml
avdivan 796142a
Update build_wheels_windows.yml
avdivan efd1806
Update build_wheels_windows.yml
avdivan f911d5c
Update build_wheels_windows.yml
avdivan 1fe589c
Update build_wheels_windows.yml
avdivan b7c288e
Update build_wheels_windows.yml
avdivan a10962c
Update build_wheels_windows.yml
avdivan 1de8fbb
Update build_wheels_windows.yml
avdivan 60b788c
Update build_wheels_windows.yml
avdivan c80b56f
Update build_wheels_windows.yml
avdivan 03b05e6
Update build_wheels_windows.yml
avdivan 46d9f36
Update build_wheels_windows.yml
avdivan ad20fe5
Update build_wheels_windows.yml
avdivan ea199ff
Update build_wheels_windows.yml
avdivan a447138
Update build_wheels_windows.yml
avdivan c62730d
Update build_wheels_windows.yml
avdivan c0546f8
Update build_wheels_windows.yml
avdivan aeddb72
Update build_wheels_windows.yml
avdivan d649b22
Update build_wheels_windows.yml
avdivan 19a231a
Update build_wheels_windows.yml
avdivan bfdddee
Update setup.py
avdivan 3f57a12
Update build_wheels_windows.yml
avdivan 659fd78
Update build_wheels_windows.yml
avdivan 7c9bbea
Update build_wheels_windows.yml
avdivan d5718fb
Update build_wheels_windows.yml
avdivan 3e4312c
Update build_wheels_windows.yml
avdivan 88c3cf6
Update build_wheels_windows.yml
avdivan 55208e9
Update build_wheels_windows.yml
avdivan 57fef17
Update build_wheels_windows.yml
avdivan 02edf94
Update build_wheels_windows.yml
avdivan b492445
Update build_wheels_windows.yml
avdivan c7354fa
Update build_wheels_windows.yml
avdivan 3c8454f
Update build_wheels_windows.yml
avdivan 6688943
Update build_wheels_windows.yml
avdivan 1b73de3
Update build_wheels_windows.yml
avdivan f9e4b60
Update setup.py
avdivan f57c90e
Update build_wheels_windows.yml
avdivan 968a007
Update build_wheels_windows.yml
avdivan 598e473
Update build_wheels_windows.yml
avdivan 89455db
Update build_wheels_windows.yml
avdivan 6bc318a
Update build_wheels_windows.yml
avdivan a242a41
Update build_wheels_windows.yml
avdivan a66914a
Update build_wheels_windows.yml
avdivan 6b45446
Update build_wheels_windows.yml
avdivan 37eef63
Update build_wheels_windows.yml
avdivan cbdc64e
Update build_wheels_windows.yml
avdivan 52b491c
Update setup.py
avdivan 52f94f5
Update build_wheels_windows.yml
avdivan f4e7680
Update setup.py
avdivan 53a25bd
Update build_wheels_windows.yml
avdivan f6bb4fc
Update setup.py
avdivan 4509c20
Update build_wheels_windows.yml
avdivan c16e60b
Update setup.py
avdivan b0c4bce
Update setup.py
avdivan 7aa637a
Update setup.py
avdivan e8c6f34
Update build_wheels_windows.yml
avdivan 2337f70
Update build_wheels_windows.yml
avdivan 0241996
Update setup.py
avdivan f12b6d9
Merge pull request #1 from opencv/4.x
avdivan 9e5d8db
Update setup.py
avdivan 1f8dcad
Update build_wheels_windows.yml
avdivan 9791ccf
Update build_wheels_windows.yml
avdivan b31fe9e
Update build_wheels_windows.yml
avdivan bd77f99
Update setup.py
avdivan 3dcfcf6
Update build_wheels_windows.yml
avdivan 87ad343
Update build_wheels_windows.yml
avdivan 249f4c9
Update build_wheels_windows.yml
avdivan dfbaa26
Update build_wheels_windows.yml
avdivan 0ce663d
Update build_wheels_windows.yml
avdivan 516ff9b
Update submodules to latest commits
92f178d
Update build_wheels_windows.yml
avdivan 0d69483
Update setup.py
avdivan d751cc8
Update build_wheels_windows.yml
avdivan ddcbeec
Update build_wheels_macos_m1.yml
avdivan 6a5fe03
Update build_wheels_macos_m1.yml
avdivan 4457886
Update build_wheels_windows.yml
avdivan 8ed18e0
Merge pull request #2 from opencv/4.x
avdivan cd34ee4
Update setup.py
avdivan c6bb9ad
Update build_wheels_windows.yml
avdivan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ on: | |
|
||
jobs: | ||
Build: | ||
runs-on: windows-2019 | ||
runs-on: windows-2025 | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
|
@@ -48,7 +48,7 @@ jobs: | |
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV | ||
fi | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
with: | ||
submodules: false | ||
fetch-depth: 0 | ||
|
@@ -61,16 +61,18 @@ jobs: | |
uses: microsoft/[email protected] | ||
- name: Setup NASM | ||
uses: ilammy/setup-nasm@v1 | ||
|
||
- name: Build a package | ||
# CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version | ||
run: | | ||
python --version | ||
python -m pip install --upgrade pip | ||
python -m pip install --upgrade setuptools | ||
python -m pip install cmake==3.24.2 | ||
python -m pip install cmake | ||
python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt | ||
set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v | ||
shell: cmd | ||
|
||
- name: Saving all wheels | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
|
@@ -79,7 +81,7 @@ jobs: | |
|
||
Test: | ||
needs: [Build] | ||
runs-on: windows-2019 | ||
runs-on: windows-2025 | ||
defaults: | ||
run: | ||
shell: cmd | ||
|
@@ -103,10 +105,11 @@ jobs: | |
rm -rf ./.??* || true | ||
working-directory: ${{ github.workspace }} | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
fetch-depth: 0 | ||
|
||
- name: Set up Python ${{ matrix.python-version }} | ||
uses: actions/setup-python@v4 | ||
with: | ||
|
Submodule multibuild
updated
20 files
+0 −91 | .appveyor.yml | |
+5 −11 | .github/workflows/lint_python.yml | |
+19 −10 | .github/workflows/test.yml | |
+4 −0 | .gitignore | |
+1 −1 | LICENSE | |
+8 −8 | README.rst | |
+17 −9 | common_utils.sh | |
+41 −42 | library_builders.sh | |
+40 −23 | osx_utils.sh | |
+16 −12 | supported_wheels.py | |
+11 −0 | tests/patches/harfbuzz-2.7.4.tar.xz.patch | |
+1 −2 | tests/test_common_utils.sh | |
+3 −1 | tests/test_fill_pyver.sh | |
+1 −1 | tests/test_fill_submodule.sh | |
+4 −0 | tests/test_library_builders.sh | |
+0 −2 | tests/test_multibuild.sh | |
+33 −9 | tests/test_osx_utils.sh | |
+1 −11 | tests/test_python_install.sh | |
+3 −3 | tests/test_supported_wheels.sh | |
+1 −1 | travis_linux_steps.sh |
Submodule opencv_contrib
updated
81 files
Submodule opencv_extra
updated
27 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not needed.