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 0b1317b

Browse filesBrowse files
skvarkskvark
committed
fix appveyor deploy, pass ENABLE_CONTRIB flag to Linux build via file
1 parent f50c2d5 commit 0b1317b
Copy full SHA for 0b1317b

File tree

Expand file treeCollapse file tree

3 files changed

+4
-1
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+4
-1
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ matrix:
199199
- ENABLE_CONTRIB=1
200200

201201
before_install:
202+
- echo $ENABLE_CONTRIB > contrib.enabled
202203
- source multibuild/common_utils.sh
203204
- source multibuild/travis_steps.sh
204205
- python find_version.py

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ before_test:
107107
108108
cd ..
109109
110-
"%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python
110+
if %ENABLE_CONTRIB% EQU 0 ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-python) else ("%PYTHON%/python.exe" -m pip install --no-index --find-links=%APPVEYOR_BUILD_FOLDER%\dist\ opencv-contrib-python)
111111
112112
test_script:
113113
- cmd: >-

‎travis/build-wheels-osx.sh

Copy file name to clipboardExpand all lines: travis/build-wheels-osx.sh
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ echo 'PIP and brew installs'
1010

1111
pip install -r requirements.txt
1212

13+
ENABLE_CONTRIB=$(<contrib.enabled)
14+
1315
echo 'Config make'
1416

1517
cd opencv

0 commit comments

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