Skip to content

CI update #1100

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

Merged
merged 15 commits into from
May 19, 2025
Merged

CI update #1100

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5b68552
Update build_wheels_windows.yml
avdivan May 12, 2025
0ed6932
Update build_wheels_windows.yml
avdivan May 12, 2025
43df361
Update build_wheels_windows.yml
avdivan May 12, 2025
800c408
Update build_wheels_windows.yml
avdivan May 12, 2025
d509950
Update build_wheels_windows.yml
avdivan May 12, 2025
81b57ad
Update build_wheels_windows.yml
avdivan May 12, 2025
cf6f2a1
Update build_wheels_windows.yml
avdivan May 12, 2025
ce9020f
Update build_wheels_windows.yml
avdivan May 12, 2025
5da97ac
Update build_wheels_windows.yml
avdivan May 12, 2025
02ffc4a
Update build_wheels_windows.yml
avdivan May 12, 2025
62aa42c
Update build_wheels_windows.yml
avdivan May 12, 2025
3f50ff6
Update build_wheels_windows.yml
avdivan May 12, 2025
24e5192
Update build_wheels_windows.yml
avdivan May 12, 2025
af76f7a
Update setup.py
avdivan May 13, 2025
8e63c5b
Update setup.py
avdivan May 18, 2025
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
24 changes: 8 additions & 16 deletions .github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ jobs:
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@v3
with:
name: wheels
path: wheelhouse/opencv*.whl
- name: Saving a wheel accordingly to matrix
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
path: wheelhouse/opencv*
Expand Down Expand Up @@ -118,7 +113,7 @@ jobs:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.platform }}
- name: Download a wheel accordingly to matrix
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
path: wheelhouse/
Expand All @@ -142,15 +137,14 @@ jobs:
Release_rolling:
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
needs: [Build, Test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
environment: opencv-python-rolling-release
defaults:
run:
shell: bash
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheels
path: wheelhouse/
- name: Upload wheels for opencv_python_rolling
run: |
Expand All @@ -172,15 +166,14 @@ jobs:
Pre-release:
if: github.event_name == 'release' && github.event.release.prerelease
needs: [Build, Test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
environment: test-opencv-python-release
defaults:
run:
shell: bash
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheels
path: wheelhouse/
- name: Upload all wheels
run: |
Expand All @@ -190,15 +183,14 @@ jobs:
Release:
if: github.event_name == 'release' && !github.event.release.prerelease
needs: [Build, Test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
environment: opencv-python-release
defaults:
run:
shell: bash
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheels
path: wheelhouse/
- name: Upload wheels for opencv_python
run: |
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ def main():
"-DBUILD_DOCS=OFF",
"-DPYTHON3_LIMITED_API=ON",
"-DBUILD_OPENEXR=ON",
"-DWITH_MSMF=OFF",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should break regular opencv-python build. Let's exclude it from the PR now and merge other CI related changes.

]
+ (
# CMake flags for windows/arm64 build
Expand Down
Loading