From 9a33dcf847cc9bc0a08ce73a66fc6e89f1f6645a Mon Sep 17 00:00:00 2001 From: Olli-Pekka Heinisuo Date: Wed, 15 Jul 2020 16:16:56 +0300 Subject: [PATCH] test --- .travis.yml | 4 +--- travis_config.sh | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6880e7..aa3093f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,6 @@ cache: # `cache: ccache: true` has no effect if `language:` is not `c` or `cpp` - $HOME/.ccache -language: python - # Add more cache stages (s2 etc) and corresponding OSX jobs like s1 # if brew builds start to take longer than one Travis time limit stages: @@ -32,7 +30,7 @@ jobs: fast_finish: true # Travis exclude is buggy, this seems to be the only way to disable default build exclude: - - language: python + - language: ruby include: - os: osx env: diff --git a/travis_config.sh b/travis_config.sh index 9a079e8..d606c83 100644 --- a/travis_config.sh +++ b/travis_config.sh @@ -14,7 +14,7 @@ function bdist_wheel_cmd { # copied from multibuild's common_utils.sh # add osx deployment target so it doesnt default to 10.6 local abs_wheelhouse=$1 - pip wheel . --wheel-dir="$PWD/dist" --verbose $BDIST_PARAMS + pip wheel --wheel-dir="$PWD/dist" . --verbose $BDIST_PARAMS cp dist/*.whl $abs_wheelhouse if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi } @@ -110,6 +110,7 @@ function pre_build { brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; } else brew unlink python@2 + brew update brew install ffmpeg_opencv fi -- GitLab