Skip to content

Commit 05a9709

Browse files
skvarkskvark
committed
test headless builds
1 parent 6dbdf95 commit 05a9709

File tree

4 files changed

+357
-23
lines changed

4 files changed

+357
-23
lines changed

‎.travis.yml‎

Lines changed: 221 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,58 @@ matrix:
3434
env:
3535
- MB_PYTHON_VERSION=2.7
3636
- ENABLE_CONTRIB=0
37+
- ENABLE_HEADLESS=0
3738
- os: osx
3839
language: generic
3940
osx_image: xcode7.3
4041
env:
4142
- MB_PYTHON_VERSION=3.4
4243
- ENABLE_CONTRIB=0
44+
- ENABLE_HEADLESS=0
4345
- os: osx
4446
language: generic
4547
osx_image: xcode7.3
4648
env:
4749
- MB_PYTHON_VERSION=3.5
4850
- ENABLE_CONTRIB=0
51+
- ENABLE_HEADLESS=0
4952
- os: osx
5053
language: generic
5154
osx_image: xcode7.3
5255
env:
5356
- MB_PYTHON_VERSION=3.6
5457
- ENABLE_CONTRIB=0
58+
- ENABLE_HEADLESS=0
59+
60+
# headless builds for MacOS
61+
- os: osx
62+
language: generic
63+
osx_image: xcode7.3
64+
env:
65+
- MB_PYTHON_VERSION=2.7
66+
- ENABLE_CONTRIB=0
67+
- ENABLE_HEADLESS=1
68+
- os: osx
69+
language: generic
70+
osx_image: xcode7.3
71+
env:
72+
- MB_PYTHON_VERSION=3.4
73+
- ENABLE_CONTRIB=0
74+
- ENABLE_HEADLESS=1
75+
- os: osx
76+
language: generic
77+
osx_image: xcode7.3
78+
env:
79+
- MB_PYTHON_VERSION=3.5
80+
- ENABLE_CONTRIB=0
81+
- ENABLE_HEADLESS=1
82+
- os: osx
83+
language: generic
84+
osx_image: xcode7.3
85+
env:
86+
- MB_PYTHON_VERSION=3.6
87+
- ENABLE_CONTRIB=0
88+
- ENABLE_HEADLESS=1
5589

5690
# Contrib builds for MacOS
5791
- os: osx
@@ -60,126 +94,302 @@ matrix:
6094
env:
6195
- MB_PYTHON_VERSION=2.7
6296
- ENABLE_CONTRIB=1
97+
- ENABLE_HEADLESS=0
6398
- os: osx
6499
language: generic
65100
osx_image: xcode7.3
66101
env:
67102
- MB_PYTHON_VERSION=3.4
68103
- ENABLE_CONTRIB=1
104+
- ENABLE_HEADLESS=0
69105
- os: osx
70106
language: generic
71107
osx_image: xcode7.3
72108
env:
73109
- MB_PYTHON_VERSION=3.5
74110
- ENABLE_CONTRIB=1
111+
- ENABLE_HEADLESS=0
75112
- os: osx
76113
language: generic
77114
osx_image: xcode7.3
78115
env:
79116
- MB_PYTHON_VERSION=3.6
80117
- ENABLE_CONTRIB=1
118+
- ENABLE_HEADLESS=0
119+
120+
# headless contrib builds for MacOS
121+
- os: osx
122+
language: generic
123+
osx_image: xcode7.3
124+
env:
125+
- MB_PYTHON_VERSION=2.7
126+
- ENABLE_CONTRIB=1
127+
- ENABLE_HEADLESS=1
128+
- os: osx
129+
language: generic
130+
osx_image: xcode7.3
131+
env:
132+
- MB_PYTHON_VERSION=3.4
133+
- ENABLE_CONTRIB=1
134+
- ENABLE_HEADLESS=1
135+
- os: osx
136+
language: generic
137+
osx_image: xcode7.3
138+
env:
139+
- MB_PYTHON_VERSION=3.5
140+
- ENABLE_CONTRIB=1
141+
- ENABLE_HEADLESS=1
142+
- os: osx
143+
language: generic
144+
osx_image: xcode7.3
145+
env:
146+
- MB_PYTHON_VERSION=3.6
147+
- ENABLE_CONTRIB=1
148+
- ENABLE_HEADLESS=1
81149

82150
# default builds for Linux
83151
- os: linux
84152
env:
85153
- MB_PYTHON_VERSION=2.7
86154
- ENABLE_CONTRIB=0
155+
- ENABLE_HEADLESS=0
156+
- os: linux
157+
env:
158+
- MB_PYTHON_VERSION=2.7
159+
- UNICODE_WIDTH=16
160+
- ENABLE_CONTRIB=0
161+
- ENABLE_HEADLESS=0
162+
- os: linux
163+
env:
164+
- MB_PYTHON_VERSION=2.7
165+
- PLAT=i686
166+
- ENABLE_CONTRIB=0
167+
- ENABLE_HEADLESS=0
168+
- os: linux
169+
env:
170+
- MB_PYTHON_VERSION=2.7
171+
- PLAT=i686
172+
- UNICODE_WIDTH=16
173+
- ENABLE_CONTRIB=0
174+
- ENABLE_HEADLESS=0
175+
- os: linux
176+
env:
177+
- MB_PYTHON_VERSION=3.4
178+
- ENABLE_CONTRIB=0
179+
- ENABLE_HEADLESS=0
180+
- os: linux
181+
env:
182+
- MB_PYTHON_VERSION=3.4
183+
- PLAT=i686
184+
- ENABLE_CONTRIB=0
185+
- ENABLE_HEADLESS=0
186+
- os: linux
187+
env:
188+
- MB_PYTHON_VERSION=3.5
189+
- ENABLE_CONTRIB=0
190+
- ENABLE_HEADLESS=0
191+
- os: linux
192+
env:
193+
- MB_PYTHON_VERSION=3.5
194+
- PLAT=i686
195+
- ENABLE_CONTRIB=0
196+
- ENABLE_HEADLESS=0
197+
- os: linux
198+
env:
199+
- MB_PYTHON_VERSION=3.6
200+
- ENABLE_CONTRIB=0
201+
- ENABLE_HEADLESS=0
202+
- TEST_DEPENDS=numpy==1.11.3
203+
- os: linux
204+
env:
205+
- MB_PYTHON_VERSION=3.6
206+
- PLAT=i686
207+
- ENABLE_CONTRIB=0
208+
- ENABLE_HEADLESS=0
209+
- TEST_DEPENDS=numpy==1.11.3
210+
211+
# headless builds for Linux
212+
- os: linux
213+
env:
214+
- MB_PYTHON_VERSION=2.7
215+
- ENABLE_CONTRIB=0
216+
- ENABLE_HEADLESS=1
87217
- os: linux
88218
env:
89219
- MB_PYTHON_VERSION=2.7
90220
- UNICODE_WIDTH=16
91221
- ENABLE_CONTRIB=0
222+
- ENABLE_HEADLESS=1
92223
- os: linux
93224
env:
94225
- MB_PYTHON_VERSION=2.7
95226
- PLAT=i686
96227
- ENABLE_CONTRIB=0
228+
- ENABLE_HEADLESS=1
97229
- os: linux
98230
env:
99231
- MB_PYTHON_VERSION=2.7
100232
- PLAT=i686
101233
- UNICODE_WIDTH=16
102234
- ENABLE_CONTRIB=0
235+
- ENABLE_HEADLESS=1
103236
- os: linux
104237
env:
105238
- MB_PYTHON_VERSION=3.4
106239
- ENABLE_CONTRIB=0
240+
- ENABLE_HEADLESS=1
107241
- os: linux
108242
env:
109243
- MB_PYTHON_VERSION=3.4
110244
- PLAT=i686
111245
- ENABLE_CONTRIB=0
246+
- ENABLE_HEADLESS=1
112247
- os: linux
113248
env:
114249
- MB_PYTHON_VERSION=3.5
115250
- ENABLE_CONTRIB=0
251+
- ENABLE_HEADLESS=1
116252
- os: linux
117253
env:
118254
- MB_PYTHON_VERSION=3.5
119255
- PLAT=i686
120256
- ENABLE_CONTRIB=0
257+
- ENABLE_HEADLESS=1
121258
- os: linux
122259
env:
123260
- MB_PYTHON_VERSION=3.6
124261
- ENABLE_CONTRIB=0
262+
- ENABLE_HEADLESS=1
125263
- TEST_DEPENDS=numpy==1.11.3
126264
- os: linux
127265
env:
128266
- MB_PYTHON_VERSION=3.6
129267
- PLAT=i686
130268
- ENABLE_CONTRIB=0
269+
- ENABLE_HEADLESS=1
131270
- TEST_DEPENDS=numpy==1.11.3
132271

133272
# contrib builds for Linux
134273
- os: linux
135274
env:
136275
- MB_PYTHON_VERSION=2.7
137276
- ENABLE_CONTRIB=1
277+
- ENABLE_HEADLESS=0
278+
- os: linux
279+
env:
280+
- MB_PYTHON_VERSION=2.7
281+
- UNICODE_WIDTH=16
282+
- ENABLE_CONTRIB=1
283+
- ENABLE_HEADLESS=0
284+
- os: linux
285+
env:
286+
- MB_PYTHON_VERSION=2.7
287+
- PLAT=i686
288+
- ENABLE_CONTRIB=1
289+
- ENABLE_HEADLESS=0
290+
- os: linux
291+
env:
292+
- MB_PYTHON_VERSION=2.7
293+
- PLAT=i686
294+
- UNICODE_WIDTH=16
295+
- ENABLE_CONTRIB=1
296+
- ENABLE_HEADLESS=0
297+
- os: linux
298+
env:
299+
- MB_PYTHON_VERSION=3.4
300+
- ENABLE_CONTRIB=1
301+
- ENABLE_HEADLESS=0
302+
- os: linux
303+
env:
304+
- MB_PYTHON_VERSION=3.4
305+
- PLAT=i686
306+
- ENABLE_CONTRIB=1
307+
- ENABLE_HEADLESS=0
308+
- os: linux
309+
env:
310+
- MB_PYTHON_VERSION=3.5
311+
- ENABLE_CONTRIB=1
312+
- ENABLE_HEADLESS=0
313+
- os: linux
314+
env:
315+
- MB_PYTHON_VERSION=3.5
316+
- PLAT=i686
317+
- ENABLE_CONTRIB=1
318+
- ENABLE_HEADLESS=0
319+
- os: linux
320+
env:
321+
- MB_PYTHON_VERSION=3.6
322+
- TEST_DEPENDS=numpy==1.11.3
323+
- ENABLE_CONTRIB=1
324+
- ENABLE_HEADLESS=0
325+
- os: linux
326+
env:
327+
- MB_PYTHON_VERSION=3.6
328+
- PLAT=i686
329+
- TEST_DEPENDS=numpy==1.11.3
330+
- ENABLE_CONTRIB=1
331+
- ENABLE_HEADLESS=0
332+
333+
# headless contrib builds for Linux
334+
- os: linux
335+
env:
336+
- MB_PYTHON_VERSION=2.7
337+
- ENABLE_CONTRIB=1
338+
- ENABLE_HEADLESS=1
138339
- os: linux
139340
env:
140341
- MB_PYTHON_VERSION=2.7
141342
- UNICODE_WIDTH=16
142343
- ENABLE_CONTRIB=1
344+
- ENABLE_HEADLESS=1
143345
- os: linux
144346
env:
145347
- MB_PYTHON_VERSION=2.7
146348
- PLAT=i686
147349
- ENABLE_CONTRIB=1
350+
- ENABLE_HEADLESS=1
148351
- os: linux
149352
env:
150353
- MB_PYTHON_VERSION=2.7
151354
- PLAT=i686
152355
- UNICODE_WIDTH=16
153356
- ENABLE_CONTRIB=1
357+
- ENABLE_HEADLESS=1
154358
- os: linux
155359
env:
156360
- MB_PYTHON_VERSION=3.4
157361
- ENABLE_CONTRIB=1
362+
- ENABLE_HEADLESS=1
158363
- os: linux
159364
env:
160365
- MB_PYTHON_VERSION=3.4
161366
- PLAT=i686
162367
- ENABLE_CONTRIB=1
368+
- ENABLE_HEADLESS=1
163369
- os: linux
164370
env:
165371
- MB_PYTHON_VERSION=3.5
166372
- ENABLE_CONTRIB=1
373+
- ENABLE_HEADLESS=1
167374
- os: linux
168375
env:
169376
- MB_PYTHON_VERSION=3.5
170377
- PLAT=i686
171378
- ENABLE_CONTRIB=1
379+
- ENABLE_HEADLESS=1
172380
- os: linux
173381
env:
174382
- MB_PYTHON_VERSION=3.6
175383
- TEST_DEPENDS=numpy==1.11.3
176384
- ENABLE_CONTRIB=1
385+
- ENABLE_HEADLESS=1
177386
- os: linux
178387
env:
179388
- MB_PYTHON_VERSION=3.6
180389
- PLAT=i686
181390
- TEST_DEPENDS=numpy==1.11.3
182391
- ENABLE_CONTRIB=1
392+
- ENABLE_HEADLESS=1
183393

184394
# The first line is printed in the folding header in Travis output
185395
before_install: |
@@ -195,6 +405,7 @@ before_install: |
195405
# This sets -x
196406
source multibuild_customize.sh
197407
echo $ENABLE_CONTRIB > contrib.enabled
408+
echo $ENABLE_HEADLESS > headless.enabled
198409
before_install
199410
# Not interested in travis internal scripts' output
200411
set +x
@@ -218,9 +429,17 @@ after_success: |
218429
pip install twine
219430
220431
if [[ $ENABLE_CONTRIB == 0 ]]; then
221-
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
432+
if [[ $ENABLE_HEADLESS == 0 ]]; then
433+
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
434+
else
435+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
436+
fi
222437
else
223-
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
438+
if [[ $ENABLE_HEADLESS == 0 ]]; then
439+
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
440+
else
441+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
442+
fi
224443
fi
225444
226445
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*

0 commit comments

Comments
 (0)