Commit9a33dcf

committed

test

1 parent705d1f0 commit9a33dcfCopy full SHA for 9a33dcf

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ cache:`
`20`	`20`	# `cache: ccache: true` has no effect if `language:` is not `c` or `cpp`
`21`	`21`	`-$HOME/.ccache`
`22`	`22`
`23`		`-language:python`
`24`		`-`
`25`	`23`	`# Add more cache stages (s2 etc) and corresponding OSX jobs like s1`
`26`	`24`	`# if brew builds start to take longer than one Travis time limit`
`27`	`25`	`stages:`
`@@ -32,7 +30,7 @@ jobs:`
`32`	`30`	`fast_finish:true`
`33`	`31`	`# Travis exclude is buggy, this seems to be the only way to disable default build`
`34`	`32`	`exclude:`
`35`		`- -language:python`
	`33`	`+ -language:ruby`
`36`	`34`	`include:`
`37`	`35`	`-os:osx`
`38`	`36`	`env:`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function bdist_wheel_cmd {`
`14`	`14`	`# copied from multibuild's common_utils.sh`
`15`	`15`	`# add osx deployment target so it doesnt default to 10.6`
`16`	`16`	`local abs_wheelhouse=$1`
`17`		`- pip wheel.--wheel-dir="$PWD/dist" --verbose$BDIST_PARAMS`
	`17`	`+ pip wheel --wheel-dir="$PWD/dist". --verbose$BDIST_PARAMS`
`18`	`18`	`cp dist/*.whl$abs_wheelhouse`
`19`	`19`	`if [-n"$USE_CCACHE"-a-z"$BREW_BOOTSTRAP_MODE" ];then ccache -s;fi`
`20`	`20`	`}`
`@@ -110,6 +110,7 @@ function pre_build {`
`110`	`110`	`brew_install_and_cache_within_time_limit ffmpeg_opencv\|\| { [$?-gt 1 ]&&return 2\|\|return 0; }`
`111`	`111`	`else`
`112`	`112`	`brew unlink python@2`
	`113`	`+ brew update`
`113`	`114`	`brew install ffmpeg_opencv`
`114`	`115`	`fi`
`115`	`116`

Comments

(0)