Skip to content

Commit 33de69a

Browse files
committed
Temporarily reduce number of modules built
1 parent 3a3fbc0 commit 33de69a

File tree

2 files changed

+1
-134
lines changed

2 files changed

+1
-134
lines changed

.travis.yml

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ cache:
2323
# Add more cache stages (s2 etc) and corresponding OSX jobs like s1
2424
# if brew builds start to take longer than one Travis time limit
2525
stages:
26-
- s1
2726
- final
2827

2928
jobs:
@@ -32,76 +31,9 @@ jobs:
3231
exclude:
3332
- language: ruby
3433
include:
35-
# source distributions
36-
- os: linux
37-
stage: s1
38-
script: skip
39-
env:
40-
- SDIST=1
41-
- ENABLE_CONTRIB=0
42-
- ENABLE_HEADLESS=0
43-
python: "3.8"
44-
language: python
45-
dist: xenial
46-
- os: linux
47-
stage: s1
48-
script: skip
49-
env:
50-
- SDIST=1
51-
- ENABLE_CONTRIB=0
52-
- ENABLE_HEADLESS=1
53-
python: "3.8"
54-
language: python
55-
dist: xenial
56-
- os: linux
57-
stage: s1
58-
script: skip
59-
env:
60-
- SDIST=1
61-
- ENABLE_CONTRIB=1
62-
- ENABLE_HEADLESS=0
63-
python: "3.8"
64-
language: python
65-
dist: xenial
66-
- os: linux
67-
stage: s1
68-
script: skip
69-
env:
70-
- SDIST=1
71-
- ENABLE_CONTRIB=1
72-
- ENABLE_HEADLESS=1
73-
python: "3.8"
74-
language: python
75-
dist: xenial
76-
7734
# default builds for MacOS
7835
#further jobs in the list will use the same stage until the next assignment
7936
- stage: final
80-
- os: osx
81-
language: generic
82-
osx_image: xcode11.6
83-
env:
84-
- MB_PYTHON_VERSION=3.8
85-
- ENABLE_CONTRIB=0
86-
- ENABLE_HEADLESS=0
87-
- TEST_DEPENDS=numpy==1.17.3
88-
cache:
89-
directories: $HOME/.ccache
90-
91-
92-
# headless builds for MacOS
93-
- os: osx
94-
language: generic
95-
osx_image: xcode11.6
96-
env:
97-
- MB_PYTHON_VERSION=3.8
98-
- ENABLE_CONTRIB=0
99-
- ENABLE_HEADLESS=1
100-
- TEST_DEPENDS=numpy==1.17.3
101-
cache:
102-
directories: $HOME/.ccache
103-
104-
10537
# Contrib builds for MacOS
10638
- os: osx
10739
language: generic
@@ -115,72 +47,6 @@ jobs:
11547
directories: $HOME/.ccache
11648

11749

118-
# headless contrib builds for MacOS
119-
- os: osx
120-
language: generic
121-
osx_image: xcode11.6
122-
env:
123-
- MB_PYTHON_VERSION=3.8
124-
- ENABLE_CONTRIB=1
125-
- ENABLE_HEADLESS=1
126-
- TEST_DEPENDS=numpy==1.17.3
127-
cache:
128-
directories: $HOME/.ccache
129-
130-
131-
# default builds for Linux
132-
- os: linux
133-
language: generic
134-
dist: xenial
135-
services: docker
136-
env:
137-
- MB_PYTHON_VERSION=3.8
138-
- ENABLE_CONTRIB=0
139-
- ENABLE_HEADLESS=0
140-
- TEST_DEPENDS=numpy==1.17.3
141-
cache:
142-
directories: $HOME/.ccache
143-
144-
# headless builds for Linux
145-
- os: linux
146-
language: generic
147-
dist: xenial
148-
services: docker
149-
env:
150-
- MB_PYTHON_VERSION=3.8
151-
- ENABLE_CONTRIB=0
152-
- ENABLE_HEADLESS=1
153-
- TEST_DEPENDS=numpy==1.17.3
154-
cache:
155-
directories: $HOME/.ccache
156-
157-
# contrib builds for Linux
158-
- os: linux
159-
language: generic
160-
dist: xenial
161-
services: docker
162-
env:
163-
- MB_PYTHON_VERSION=3.8
164-
- TEST_DEPENDS=numpy==1.17.3
165-
- ENABLE_CONTRIB=1
166-
- ENABLE_HEADLESS=0
167-
cache:
168-
directories: $HOME/.ccache
169-
170-
171-
# headless contrib builds for Linux
172-
- os: linux
173-
language: generic
174-
dist: xenial
175-
services: docker
176-
env:
177-
- MB_PYTHON_VERSION=3.8
178-
- TEST_DEPENDS=numpy==1.17.3
179-
- ENABLE_CONTRIB=1
180-
- ENABLE_HEADLESS=1
181-
cache:
182-
directories: $HOME/.ccache
183-
18450
# The first line is printed in the folding header in Travis output
18551
before_install: |
18652
set -e

travis_osx_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function pre_build_osx {
4444
-DBUILD_TESTS=OFF
4545
-DBUILD_PERF_TESTS=OFF
4646
-DBUILD_DOCS=OFF
47+
-DBUILD_LIST=core,imgproc,videoio,python3 # FIXME: experiments
4748
)
4849
if [ $ENABLE_CONTRIB -ne 0 ]; then
4950
CMAKE_OPTS+=(-DOPENCV_EXTRA_MODULES_PATH="$repo_dir/opencv_contrib/modules")

0 commit comments

Comments
 (0)