Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit dfc63bf

Browse filesBrowse files
asenyaevasenyaev
committed
Changed a path to config-X.py file after python limited API support, optimized uploading and downloading artifacts
1 parent 10686b6 commit dfc63bf
Copy full SHA for dfc63bf

6 files changed

+27
-303
lines changed

‎.github/workflows/build_wheels_linux.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux.yml
+5-49Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -67,33 +67,11 @@ jobs:
6767
name: wheels
6868
path: wheelhouse/opencv*.whl
6969

70-
- name: Saving opencv-python wheels
71-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
70+
- name: Saving a wheel accordingly to matrix
7271
uses: actions/upload-artifact@v2
7372
with:
74-
name: opencv-python-wheels
75-
path: wheelhouse/opencv_python-*.whl
76-
77-
- name: Saving opencv-python-headless wheels
78-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
79-
uses: actions/upload-artifact@v2
80-
with:
81-
name: opencv-python-headless-wheels
82-
path: wheelhouse/opencv_python_headless-*.whl
83-
84-
- name: Saving opencv-contrib-python wheels
85-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
86-
uses: actions/upload-artifact@v2
87-
with:
88-
name: opencv-contrib-python-wheels
89-
path: wheelhouse/opencv_contrib_python-*.whl
90-
91-
- name: Saving opencv-contrib-python-headless wheels
92-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
93-
uses: actions/upload-artifact@v2
94-
with:
95-
name: opencv-contrib-python-headless-wheels
96-
path: wheelhouse/opencv_contrib_python_headless-*.whl
73+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
74+
path: wheelhouse/opencv*.whl
9775

9876
test:
9977
needs: [build]
@@ -130,32 +108,10 @@ jobs:
130108
- name: Setup Environment variables
131109
run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
132110

133-
- name: Download opencv-python wheels
134-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
135-
uses: actions/download-artifact@v2
136-
with:
137-
name: opencv-python-wheels
138-
path: wheelhouse/
139-
140-
- name: Download opencv-python-headless wheels
141-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
142-
uses: actions/download-artifact@v2
143-
with:
144-
name: opencv-python-headless-wheels
145-
path: wheelhouse/
146-
147-
- name: Download opencv-contrib-python wheels
148-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
149-
uses: actions/download-artifact@v2
150-
with:
151-
name: opencv-contrib-python-wheels
152-
path: wheelhouse/
153-
154-
- name: Download opencv-contrib-python-headless wheels
155-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
111+
- name: Download a wheel accordingly to matrix
156112
uses: actions/download-artifact@v2
157113
with:
158-
name: opencv-contrib-python-headless-wheels
114+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
159115
path: wheelhouse/
160116

161117
- name: Package installation and run tests

‎.github/workflows/build_wheels_linux_arm.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux_arm.yml
+5-49Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -67,33 +67,11 @@ jobs:
6767
name: wheels
6868
path: wheelhouse/opencv*.whl
6969

70-
- name: Saving opencv-python wheels
71-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
70+
- name: Saving a wheel accordingly to matrix
7271
uses: actions/upload-artifact@v2
7372
with:
74-
name: opencv-python-wheels
75-
path: wheelhouse/opencv_python-*.whl
76-
77-
- name: Saving opencv-python-headless wheels
78-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
79-
uses: actions/upload-artifact@v2
80-
with:
81-
name: opencv-python-headless-wheels
82-
path: wheelhouse/opencv_python_headless-*.whl
83-
84-
- name: Saving opencv-contrib-python wheels
85-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
86-
uses: actions/upload-artifact@v2
87-
with:
88-
name: opencv-contrib-python-wheels
89-
path: wheelhouse/opencv_contrib_python-*.whl
90-
91-
- name: Saving opencv-contrib-python-headless wheels
92-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
93-
uses: actions/upload-artifact@v2
94-
with:
95-
name: opencv-contrib-python-headless-wheels
96-
path: wheelhouse/opencv_contrib_python_headless-*.whl
73+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
74+
path: wheelhouse/opencv*.whl
9775

9876
test:
9977
needs: [build_arm]
@@ -136,32 +114,10 @@ jobs:
136114
- name: Setup Environment variables
137115
run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
138116

139-
- name: Download opencv-python wheels
140-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
141-
uses: actions/download-artifact@v2
142-
with:
143-
name: opencv-python-wheels
144-
path: wheelhouse/
145-
146-
- name: Download opencv-python-headless wheels
147-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
148-
uses: actions/download-artifact@v2
149-
with:
150-
name: opencv-python-headless-wheels
151-
path: wheelhouse/
152-
153-
- name: Download opencv-contrib-python wheels
154-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
155-
uses: actions/download-artifact@v2
156-
with:
157-
name: opencv-contrib-python-wheels
158-
path: wheelhouse/
159-
160-
- name: Download opencv-contrib-python-headless wheels
161-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
117+
- name: Download a wheel accordingly to matrix
162118
uses: actions/download-artifact@v2
163119
with:
164-
name: opencv-contrib-python-headless-wheels
120+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
165121
path: wheelhouse/
166122

167123
- name: Package installation and run tests

‎.github/workflows/build_wheels_macos.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos.yml
+5-49Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -94,33 +94,11 @@ jobs:
9494
name: wheels
9595
path: wheelhouse/opencv*.whl
9696

97-
- name: Saving opencv-python wheels
98-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
97+
- name: Saving a wheel accordingly to matrix
9998
uses: actions/upload-artifact@v2
10099
with:
101-
name: opencv-python-wheels
102-
path: wheelhouse/opencv_python-*.whl
103-
104-
- name: Saving opencv-python-headless wheels
105-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
106-
uses: actions/upload-artifact@v2
107-
with:
108-
name: opencv-python-headless-wheels
109-
path: wheelhouse/opencv_python_headless-*.whl
110-
111-
- name: Saving opencv-contrib-python wheels
112-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
113-
uses: actions/upload-artifact@v2
114-
with:
115-
name: opencv-contrib-python-wheels
116-
path: wheelhouse/opencv_contrib_python-*.whl
117-
118-
- name: Saving opencv-contrib-python-headless wheels
119-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
120-
uses: actions/upload-artifact@v2
121-
with:
122-
name: opencv-contrib-python-headless-wheels
123-
path: wheelhouse/opencv_contrib_python_headless-*.whl
100+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
101+
path: wheelhouse/opencv*.whl
124102

125103
test:
126104
needs: [build]
@@ -175,32 +153,10 @@ jobs:
175153
- name: Setup Environment variables
176154
run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
177155

178-
- name: Download opencv-python wheels
179-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
180-
uses: actions/download-artifact@v2
181-
with:
182-
name: opencv-python-wheels
183-
path: wheelhouse/
184-
185-
- name: Download opencv-python-headless wheels
186-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
187-
uses: actions/download-artifact@v2
188-
with:
189-
name: opencv-python-headless-wheels
190-
path: wheelhouse/
191-
192-
- name: Download opencv-contrib-python wheels
193-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
194-
uses: actions/download-artifact@v2
195-
with:
196-
name: opencv-contrib-python-wheels
197-
path: wheelhouse/
198-
199-
- name: Download opencv-contrib-python-headless wheels
200-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
156+
- name: Download a wheel accordingly to matrix
201157
uses: actions/download-artifact@v2
202158
with:
203-
name: opencv-contrib-python-headless-wheels
159+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
204160
path: wheelhouse/
205161

206162
- name: Package installation

‎.github/workflows/build_wheels_macos_m1.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos_m1.yml
+5-49Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,11 @@ jobs:
5959
name: wheels
6060
path: wheelhouse/opencv*.whl
6161

62-
- name: Saving opencv-python wheels
63-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
62+
- name: Saving a wheel accordingly to matrix
6463
uses: actions/upload-artifact@v2
6564
with:
66-
name: opencv-python-wheels
67-
path: wheelhouse/opencv_python-*.whl
68-
69-
- name: Saving opencv-python-headless wheels
70-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
71-
uses: actions/upload-artifact@v2
72-
with:
73-
name: opencv-python-headless-wheels
74-
path: wheelhouse/opencv_python_headless-*.whl
75-
76-
- name: Saving opencv-contrib-python wheels
77-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
78-
uses: actions/upload-artifact@v2
79-
with:
80-
name: opencv-contrib-python-wheels
81-
path: wheelhouse/opencv_contrib_python-*.whl
82-
83-
- name: Saving opencv-contrib-python-headless wheels
84-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
85-
uses: actions/upload-artifact@v2
86-
with:
87-
name: opencv-contrib-python-headless-wheels
88-
path: wheelhouse/opencv_contrib_python_headless-*.whl
65+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
66+
path: wheelhouse/opencv*.whl
8967

9068
test:
9169
needs: [build]
@@ -111,32 +89,10 @@ jobs:
11189
submodules: true
11290
fetch-depth: 0
11391

114-
- name: Download opencv-python wheels
115-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
116-
uses: actions/download-artifact@v2
117-
with:
118-
name: opencv-python-wheels
119-
path: wheelhouse/
120-
121-
- name: Download opencv-python-headless wheels
122-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
123-
uses: actions/download-artifact@v2
124-
with:
125-
name: opencv-python-headless-wheels
126-
path: wheelhouse/
127-
128-
- name: Download opencv-contrib-python wheels
129-
if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
130-
uses: actions/download-artifact@v2
131-
with:
132-
name: opencv-contrib-python-wheels
133-
path: wheelhouse/
134-
135-
- name: Download opencv-contrib-python-headless wheels
136-
if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
92+
- name: Download a wheel accordingly to matrix
13793
uses: actions/download-artifact@v2
13894
with:
139-
name: opencv-contrib-python-headless-wheels
95+
name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
14096
path: wheelhouse/
14197

14298
- name: Package installation

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.