提交 6c98a57f 编写于 作者: O Olli-Pekka Heinisuo

drop Python 2.7, experimental Azure Storage artifact upload support

上级 1ca69aaa
......@@ -63,14 +63,6 @@ matrix:
# default builds for MacOS
#further jobs in the list will use the same stage until the next assignment
- stage: final
os: osx
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
workspaces:
use: brew_cache
- os: osx
osx_image: xcode9.4
env:
......@@ -107,14 +99,6 @@ matrix:
use: brew_cache
# headless builds for MacOS
- os: osx
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
workspaces:
use: brew_cache
- os: osx
osx_image: xcode9.4
env:
......@@ -151,14 +135,6 @@ matrix:
use: brew_cache
# Contrib builds for MacOS
- os: osx
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
workspaces:
use: brew_cache
- os: osx
osx_image: xcode9.4
env:
......@@ -195,14 +171,6 @@ matrix:
use: brew_cache
# headless contrib builds for MacOS
- os: osx
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
workspaces:
use: brew_cache
- os: osx
osx_image: xcode9.4
env:
......@@ -239,38 +207,6 @@ matrix:
use: brew_cache
# default builds for Linux
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=3.5
......@@ -339,38 +275,6 @@ matrix:
directories: $HOME/.ccache
# headless builds for Linux
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=3.5
......@@ -439,38 +343,6 @@ matrix:
directories: $HOME/.ccache
# contrib builds for Linux
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=3.5
......@@ -540,38 +412,6 @@ matrix:
# headless contrib builds for Linux
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=2.7
- PLAT=i686
- UNICODE_WIDTH=16
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
env:
- MB_PYTHON_VERSION=3.5
......@@ -711,7 +551,7 @@ before_cache: |
set +x; set +e
after_success: |
# Upload wheels to pypi if requested
# Upload wheels to pypi if tag is set, otherwise save to Azure Storage
if [ -n "$TRAVIS_TAG" ]; then
set -x
......@@ -742,5 +582,16 @@ after_success: |
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
set +x
else
echo "Tag not set, deployment skipped."
set -x
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
else
brew install azure-cli
fi
az storage container create -n ${$TRAVIS_COMMIT} --public-access blob
az storage blob upload-batch -d ${$TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern *.whl
set -x
fi
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册