@@ -248,51 +248,36 @@ jobs:
248
248
needs :[build, build-windows-x86_64, build_sdist]
249
249
runs-on :ubuntu-latest
250
250
environment :test-opencv-python-release
251
- defaults :
252
- run :
253
- shell :bash
254
251
steps :
255
252
-uses :actions/download-artifact@v2
256
253
with :
257
254
name :wheels
258
255
path :wheelhouse/
259
-
260
- -name :Upload wheels ${{ matrix.os }}
261
- env :
262
- # PYPI repository credentials
263
- TWINE_USERNAME :${{ secrets.PYPI_USERNAME }}
264
- TWINE_PASSWORD :${{ secrets.PYPI_PASSWORD }}
265
- TEST_ENV_VAR :test
266
- run :|
267
- python -m pip install twine
268
- echo ${{ secrets.OPENCV_PYTHON_USERNAME }}
269
- echo ${Env:TWINE_USERNAME}
270
- echo ${Env:TEST_ENV_VAR}
271
- python -m twine upload --repository testpypi -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_*
272
-
256
+ -name :Publish package
257
+ uses :pypa/gh-action-pypi-publish@release/v1
258
+ with :
259
+ user :${{ secrets.PYPI_USERNAME }}
260
+ password :${{ secrets.PYPI_PASSWORD }}
261
+ repository_url :https://test.pypi.org/legacy/
262
+ packages_dir :wheelhouse/
263
+ skip_existing :true
264
+ verbose :true
273
265
274
266
release_opencv_python :
275
267
if :startsWith(github.ref, 'refs/tags/v')
276
268
needs :[build, build-windows-x86_64, build_sdist]
277
269
runs-on :ubuntu-latest
278
270
environment :opencv-python-release
279
- defaults :
280
- run :
281
- shell :bash
282
271
steps :
283
272
-uses :actions/download-artifact@v2
284
273
with :
285
274
name :wheels
286
275
path :wheelhouse/
287
276
288
277
-name :Upload wheels ${{ matrix.os }}
289
- env :
290
- # PYPI repository credentials
291
- TWINE_USERNAME :${{ secrets.OPENCV_PYTHON_USERNAME }}
292
- TWINE_PASSWORD :${{ secrets.OPENCV_PYTHON_PASSWORD }}
293
278
run :|
294
279
python -m pip install twine
295
- python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD } --skip-existing wheelhouse/opencv_python-*
280
+ python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD } } --skip-existing wheelhouse/opencv_python-*
296
281
297
282
release_opencv_contrib_python :
298
283
if :startsWith(github.ref, 'refs/tags/v')
@@ -309,13 +294,9 @@ jobs:
309
294
path :wheelhouse/
310
295
311
296
-name :Upload wheels ${{ matrix.os }}
312
- env :
313
- # PYPI repository credentials
314
- TWINE_USERNAME :${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }}
315
- TWINE_PASSWORD :${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }}
316
297
run :|
317
298
python -m pip install twine
318
- python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD } --skip-existing wheelhouse/opencv_contrib_python-*
299
+ python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD } } --skip-existing wheelhouse/opencv_contrib_python-*
319
300
320
301
release_opencv_python_headless :
321
302
if :startsWith(github.ref, 'refs/tags/v')
@@ -332,13 +313,9 @@ jobs:
332
313
path :wheelhouse/
333
314
334
315
-name :Upload wheels ${{ matrix.os }}
335
- env :
336
- # PYPI repository credentials
337
- TWINE_USERNAME :${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }}
338
- TWINE_PASSWORD :${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }}
339
316
run :|
340
317
python -m pip install twine
341
- python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD } --skip-existing wheelhouse/opencv_python_headless-*
318
+ python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD } } --skip-existing wheelhouse/opencv_python_headless-*
342
319
343
320
release_opencv_contrib_python_headless :
344
321
if :startsWith(github.ref, 'refs/tags/v')
@@ -355,10 +332,6 @@ jobs:
355
332
path :wheelhouse/
356
333
357
334
-name :Upload wheels ${{ matrix.os }}
358
- env :
359
- # PYPI repository credentials
360
- TWINE_USERNAME :${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }}
361
- TWINE_PASSWORD :${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }}
362
335
run :|
363
336
python -m pip install twine
364
- python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD } --skip-existing wheelhouse/opencv_contrib_python_headless-*
337
+ python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD } } --skip-existing wheelhouse/opencv_contrib_python_headless-*