8000 build matrix fixes · SimLeek/opencv-python@3c518c5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3c518c5

Browse files
skvarkskvark
committed
build matrix fixes
1 parent 9297e4e commit 3c518c5

File tree

2 files changed

+36
-32
lines changed

2 files changed

+36
-32
lines changed

‎.travis.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@ matrix:
9898
- TEST_DEPENDS=numpy==1.14.5
9999
workspaces:
100100
use: brew_cache
101+
- os: osx
102+
osx_image: xcode8.3
103+
env:
104+
- MB_PYTHON_VERSION=3.8
105+
- ENABLE_CONTRIB=0
106+
- ENABLE_HEADLESS=0
107+
- TEST_DEPENDS=numpy==1.17.3
108+
workspaces:
109+
use: brew_cache
101110

102111
# headless builds for MacOS
103112
- os: osx
@@ -133,6 +142,15 @@ matrix:
133142
- TEST_DEPENDS=numpy==1.14.5
134143
workspaces:
135144
use: brew_cache
145+
- os: osx
146+
osx_image: xcode8.3
147+
env:
148+
- MB_PYTHON_VERSION=3.8
149+
- ENABLE_CONTRIB=0
150+
- ENABLE_HEADLESS=1
151+
- TEST_DEPENDS=numpy==1.17.3
152+
workspaces:
153+
use: brew_cache
136154

137155
# Contrib builds for MacOS
138156
- os: osx
@@ -168,6 +186,15 @@ matrix:
168186
- TEST_DEPENDS=numpy==1.14.5
169187
workspaces:
170188
use: brew_cache
189+
- os: osx
190+
osx_image: xcode8.3
191+
env:
192+
- MB_PYTHON_VERSION=3.8
193+
- ENABLE_CONTRIB=1
194+
- ENABLE_HEADLESS=0
195+
- TEST_DEPENDS=numpy==1.17.3
196+
workspaces:
197+
use: brew_cache
171198

172199
# headless contrib builds for MacOS
173200
- os: osx
@@ -203,6 +230,15 @@ matrix:
203230
- TEST_DEPENDS=numpy==1.14.5
204231
workspaces:
205232
use: brew_cache
233+
- os: osx
234+
osx_image: xcode8.3
235+
env:
236+
- MB_PYTHON_VERSION=3.8
237+
- ENABLE_CONTRIB=1
238+
- ENABLE_HEADLESS=1
239+
- TEST_DEPENDS=numpy==1.17.3
240+
workspaces:
241+
use: brew_cache
206242

207243
# default builds for Linux
208244
- os: linux

‎appveyor.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ environment:
1414
ENABLE_CONTRIB: 0
1515
ENABLE_HEADLESS: 0
1616

17-
- PYTHON: "C:/Python34"
18-
ENABLE_CONTRIB: 0
19-
ENABLE_HEADLESS: 0
20-
21-
- PYTHON: "C:/Python34-x64"
22-
ENABLE_CONTRIB: 0
23-
ENABLE_HEADLESS: 0
24-
2517
- PYTHON: "C:/Python35"
2618
ENABLE_CONTRIB: 0
2719
ENABLE_HEADLESS: 0
@@ -62,14 +54,6 @@ environment:
6254
ENABLE_CONTRIB: 1
6355
ENABLE_HEADLESS: 0
6456

65-
- PYTHON: "C:/Python34"
66-
ENABLE_CONTRIB: 1
67-
ENABLE_HEADLESS: 0
68-
69-
- PYTHON: "C:/Python34-x64"
70-
ENABLE_CONTRIB: 1
71-
ENABLE_HEADLESS: 0
72-
7357
- PYTHON: "C:/Python35"
7458
ENABLE_CONTRIB: 1
7559
ENABLE_HEADLESS: 0
@@ -110,14 +94,6 @@ environment:
11094
ENABLE_CONTRIB: 0
11195
ENABLE_HEADLESS: 1
11296

113-
- PYTHON: "C:/Python34"
114-
ENABLE_CONTRIB: 0
115-
ENABLE_HEADLESS: 1
116-
117-
- PYTHON: "C:/Python34-x64"
118-
ENABLE_CONTRIB: 0
119-
ENABLE_HEADLESS: 1
120-
12197
- PYTHON: "C:/Python35"
12298
ENABLE_CONTRIB: 0
12399
ENABLE_HEADLESS: 1
@@ -158,14 +134,6 @@ environment:
158134
ENABLE_CONTRIB: 1
159135
ENABLE_HEADLESS: 1
160136

161-
- PYTHON: "C:/Python34"
162-
ENABLE_CONTRIB: 1
163-
ENABLE_HEADLESS: 1
164-
165-
- PYTHON: "C:/Python34-x64"
166-
ENABLE_CONTRIB: 1
167-
ENABLE_HEADLESS: 1
168-
169137
- PYTHON: "C:/Python35"
170138
ENABLE_CONTRIB: 1
171139
ENABLE_HEADLESS: 1

0 commit comments

Comments
 (0)
0