Skip to content

Commit 2606a60

Browse files
authored
Merge pull request #1100 from avdivan:4.x
* Update build_wheels_windows.yml * Update setup.py
1 parent 255564a commit 2606a60

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

.github/workflows/build_wheels_windows.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,7 @@ jobs:
7272
set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v
7373
shell: cmd
7474
- name: Saving all wheels
75-
uses: actions/upload-artifact@v3
76-
with:
77-
name: wheels
78-
path: wheelhouse/opencv*.whl
79-
- name: Saving a wheel accordingly to matrix
80-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
8176
with:
8277
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
8378
path: wheelhouse/opencv*
@@ -118,7 +113,7 @@ jobs:
118113
python-version: ${{ matrix.python-version }}
119114
architecture: ${{ matrix.platform }}
120115
- name: Download a wheel accordingly to matrix
121-
uses: actions/download-artifact@v3
116+
uses: actions/download-artifact@v4
122117
with:
123118
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
124119
path: wheelhouse/
@@ -142,15 +137,14 @@ jobs:
142137
Release_rolling:
143138
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
144139
needs: [Build, Test]
145-
runs-on: ubuntu-20.04
140+
runs-on: ubuntu-22.04
146141
environment: opencv-python-rolling-release
147142
defaults:
148143
run:
149144
shell: bash
150145
steps:
151-
- uses: actions/download-artifact@v3
146+
- uses: actions/download-artifact@v4
152147
with:
153-
name: wheels
154148
path: wheelhouse/
155149
- name: Upload wheels for opencv_python_rolling
156150
run: |
@@ -172,15 +166,14 @@ jobs:
172166
Pre-release:
173167
if: github.event_name == 'release' && github.event.release.prerelease
174168
needs: [Build, Test]
175-
runs-on: ubuntu-20.04
169+
runs-on: ubuntu-22.04
176170
environment: test-opencv-python-release
177171
defaults:
178172
run:
179173
shell: bash
180174
steps:
181-
- uses: actions/download-artifact@v3
175+
- uses: actions/download-artifact@v4
182176
with:
183-
name: wheels
184177
path: wheelhouse/
185178
- name: Upload all wheels
186179
run: |
@@ -190,15 +183,14 @@ jobs:
190183
Release:
191184
if: github.event_name == 'release' && !github.event.release.prerelease
192185
needs: [Build, Test]
193-
runs-on: ubuntu-20.04
186+
runs-on: ubuntu-22.04
194187
environment: opencv-python-release
195188
defaults:
196189
run:
197190
shell: bash
198191
steps:
199-
- uses: actions/download-artifact@v3
192+
- uses: actions/download-artifact@v4
200193
with:
201-
name: wheels
202194
path: wheelhouse/
203195
- name: Upload wheels for opencv_python
204196
run: |

0 commit comments

Comments
 (0)