Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
奇树谦
opencv-python
提交
5288ba5f
O
opencv-python
项目概览
奇树谦
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5288ba5f
编写于
1月 26, 2019
作者:
O
Olli-Pekka Heinisuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update travis xcode 8 to 8.3
上级
5e193e36
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
27 deletion
+27
-27
.travis.yml
.travis.yml
+27
-27
未找到文件。
.travis.yml
浏览文件 @
5288ba5f
...
@@ -33,7 +33,7 @@ cache:
...
@@ -33,7 +33,7 @@ cache:
-
$HOME/local_bottle_metadata
-
$HOME/local_bottle_metadata
# `cache: ccache: true` has no effect if `language:` is not `c` or `cpp`
# `cache: ccache: true` has no effect if `language:` is not `c` or `cpp`
-
$HOME/.ccache
-
$HOME/.ccache
matrix
:
matrix
:
fast_finish
:
true
fast_finish
:
true
include
:
include
:
...
@@ -41,7 +41,7 @@ matrix:
...
@@ -41,7 +41,7 @@ matrix:
# default builds for MacOS
# default builds for MacOS
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -49,7 +49,7 @@ matrix:
...
@@ -49,7 +49,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -57,7 +57,7 @@ matrix:
...
@@ -57,7 +57,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -65,7 +65,7 @@ matrix:
...
@@ -65,7 +65,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -73,7 +73,7 @@ matrix:
...
@@ -73,7 +73,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.7
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -84,7 +84,7 @@ matrix:
...
@@ -84,7 +84,7 @@ matrix:
# headless builds for MacOS
# headless builds for MacOS
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -92,7 +92,7 @@ matrix:
...
@@ -92,7 +92,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -100,7 +100,7 @@ matrix:
...
@@ -100,7 +100,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -108,7 +108,7 @@ matrix:
...
@@ -108,7 +108,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -116,7 +116,7 @@ matrix:
...
@@ -116,7 +116,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.7
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=0
-
ENABLE_CONTRIB=0
...
@@ -127,7 +127,7 @@ matrix:
...
@@ -127,7 +127,7 @@ matrix:
# Contrib builds for MacOS
# Contrib builds for MacOS
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -135,7 +135,7 @@ matrix:
...
@@ -135,7 +135,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -143,7 +143,7 @@ matrix:
...
@@ -143,7 +143,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -151,7 +151,7 @@ matrix:
...
@@ -151,7 +151,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -159,7 +159,7 @@ matrix:
...
@@ -159,7 +159,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.7
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -170,7 +170,7 @@ matrix:
...
@@ -170,7 +170,7 @@ matrix:
# headless contrib builds for MacOS
# headless contrib builds for MacOS
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=2.7
-
MB_PYTHON_VERSION=2.7
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -178,7 +178,7 @@ matrix:
...
@@ -178,7 +178,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.4
-
MB_PYTHON_VERSION=3.4
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -186,7 +186,7 @@ matrix:
...
@@ -186,7 +186,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.5
-
MB_PYTHON_VERSION=3.5
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -194,7 +194,7 @@ matrix:
...
@@ -194,7 +194,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.6
-
MB_PYTHON_VERSION=3.6
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -202,7 +202,7 @@ matrix:
...
@@ -202,7 +202,7 @@ matrix:
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
-
os
:
osx
-
os
:
osx
language
:
generic
language
:
generic
osx_image
:
xcode8
osx_image
:
xcode8
.3
env
:
env
:
-
MB_PYTHON_VERSION=3.7
-
MB_PYTHON_VERSION=3.7
-
ENABLE_CONTRIB=1
-
ENABLE_CONTRIB=1
...
@@ -618,7 +618,7 @@ before_install: |
...
@@ -618,7 +618,7 @@ before_install: |
source multibuild_customize.sh
source multibuild_customize.sh
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
echo $ENABLE_HEADLESS > headless.enabled
if [ -n "$IS_OSX" ]; then
if [ -n "$IS_OSX" ]; then
TAPS="$(brew --repository)/Library/Taps"
TAPS="$(brew --repository)/Library/Taps"
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
...
@@ -629,10 +629,10 @@ before_install: |
...
@@ -629,10 +629,10 @@ before_install: |
cd $(dirname '\''{}'\'')
cd $(dirname '\''{}'\'')
git clean -fxd
git clean -fxd
git status' \;
git status' \;
brew_cache_cleanup
brew_cache_cleanup
fi
fi
before_install
before_install
# Not interested in travis internal scripts' output
# Not interested in travis internal scripts' output
set +x
set +x
...
@@ -653,7 +653,7 @@ script: |
...
@@ -653,7 +653,7 @@ script: |
#otherwise, Travis logic terminates prematurely
#otherwise, Travis logic terminates prematurely
#https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
#https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
trap ERR
trap ERR
test "$rc" -eq 0
test "$rc" -eq 0
before_cache
:
|
before_cache
:
|
...
@@ -667,10 +667,10 @@ before_cache: |
...
@@ -667,10 +667,10 @@ before_cache: |
fi
fi
brew_cache_cleanup
brew_cache_cleanup
fi
fi
set +x
set +x
after_success
:
|
after_success
:
|
# Upload wheels to pypi if requested
# Upload wheels to pypi if requested
if [ -n "$TRAVIS_TAG" ]; then
if [ -n "$TRAVIS_TAG" ]; then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录