Skip to content

O
opencv-python

OpenCV / opencv-python
12 个月 前同步成功

通知 230
Star 3707
Fork 754
O
opencv-python

体验新版 GitCode，发现更多精彩内容 >>

提交 5cd0ffb7 编写于 作者: O Olli-Pekka Heinisuo
浏览文件
操作

remove global PLAT, possible fix for multibuild failure

上级 c1210dbb
隐藏空白更改
内联 并排
Showing with 25 addition and 2 deletion
.travis.yml
浏览文件 @ 5cd0ffb7
......@@ -7,7 +7,6 @@ env:
- BDIST_PARAMS=""
- CONFIG_PATH="travis_config.sh"
- USE_CCACHE=1
- PLAT=x86_64
- UNICODE_WIDTH=32
......@@ -241,6 +240,7 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -249,6 +249,7 @@ matrix:
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -273,6 +274,7 @@ matrix:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -288,6 +290,7 @@ matrix:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -304,6 +307,7 @@ matrix:
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.11.3
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -321,6 +325,7 @@ matrix:
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -339,6 +344,7 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -347,6 +353,7 @@ matrix:
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -371,6 +378,7 @@ matrix:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -386,6 +394,7 @@ matrix:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -402,6 +411,7 @@ matrix:
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.11.3
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -419,6 +429,7 @@ matrix:
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -437,6 +448,7 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -445,6 +457,7 @@ matrix:
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -469,6 +482,7 @@ matrix:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -484,6 +498,7 @@ matrix:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -500,6 +515,7 @@ matrix:
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -517,6 +533,7 @@ matrix:
- TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -536,6 +553,7 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -544,6 +562,7 @@ matrix:
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -568,6 +587,7 @@ matrix:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -583,6 +603,7 @@ matrix:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -599,6 +620,7 @@ matrix:
- TEST_DEPENDS=numpy==1.11.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......@@ -616,6 +638,7 @@ matrix:
- TEST_DEPENDS=numpy==1.14.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- PLAT=x86_64
cache:
directories: $HOME/.ccache
- os: linux
......
multibuild @ 68a4af04
比较 951b6c64...68a4af04
Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b
Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或