Skip to content

Commit 6c98a57

Browse files
skvarkskvark
committed
drop Python 2.7, experimental Azure Storage artifact upload support
1 parent 1ca69aa commit 6c98a57

File tree

1 file changed

+13
-162
lines changed

1 file changed

+13
-162
lines changed

‎.travis.yml

Lines changed: 13 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,6 @@ matrix:
6363
# default builds for MacOS
6464
#further jobs in the list will use the same stage until the next assignment
6565
- stage: final
66-
os: osx
67-
osx_image: xcode9.4
68-
env:
69-
- MB_PYTHON_VERSION=2.7
70-
- ENABLE_CONTRIB=0
71-
- ENABLE_HEADLESS=0
72-
workspaces:
73-
use: brew_cache
7466
- os: osx
7567
osx_image: xcode9.4
7668
env:
@@ -107,14 +99,6 @@ matrix:
10799
use: brew_cache
108100

109101
# headless builds for MacOS
110-
- os: osx
111-
osx_image: xcode9.4
112-
env:
113-
- MB_PYTHON_VERSION=2.7
114-
- ENABLE_CONTRIB=0
115-
- ENABLE_HEADLESS=1
116-
workspaces:
117-
use: brew_cache
118102
- os: osx
119103
osx_image: xcode9.4
120104
env:
@@ -151,14 +135,6 @@ matrix:
151135
use: brew_cache
152136

153137
# Contrib builds for MacOS
154-
- os: osx
155-
osx_image: xcode9.4
156-
env:
157-
- MB_PYTHON_VERSION=2.7
158-
- ENABLE_CONTRIB=1
159-
- ENABLE_HEADLESS=0
160-
workspaces:
161-
use: brew_cache
162138
- os: osx
163139
osx_image: xcode9.4
164140
env:
@@ -195,14 +171,6 @@ matrix:
195171
use: brew_cache
196172

197173
# headless contrib builds for MacOS
198-
- os: osx
199-
osx_image: xcode9.4
200-
env:
201-
- MB_PYTHON_VERSION=2.7
202-
- ENABLE_CONTRIB=1
203-
- ENABLE_HEADLESS=1
204-
workspaces:
205-
use: brew_cache
206174
- os: osx
207175
osx_image: xcode9.4
208176
env:
@@ -239,38 +207,6 @@ matrix:
239207
use: brew_cache
240208

241209
# default builds for Linux
242-
- os: linux
243-
env:
244-
- MB_PYTHON_VERSION=2.7
245-
- ENABLE_CONTRIB=0
246-
- ENABLE_HEADLESS=0
247-
cache:
248-
directories: $HOME/.ccache
249-
- os: linux
250-
env:
251-
- MB_PYTHON_VERSION=2.7
252-
- UNICODE_WIDTH=16
253-
- ENABLE_CONTRIB=0
254-
- ENABLE_HEADLESS=0
255-
cache:
256-
directories: $HOME/.ccache
257-
- os: linux
258-
env:
259-
- MB_PYTHON_VERSION=2.7
260-
- PLAT=i686
261-
- ENABLE_CONTRIB=0
262-
- ENABLE_HEADLESS=0
263-
cache:
264-
directories: $HOME/.ccache
265-
- os: linux
266-
env:
267-
- MB_PYTHON_VERSION=2.7
268-
- PLAT=i686
269-
- UNICODE_WIDTH=16
270-
- ENABLE_CONTRIB=0
271-
- ENABLE_HEADLESS=0
272-
cache:
273-
directories: $HOME/.ccache
274210
- os: linux
275211
env:
276212
- MB_PYTHON_VERSION=3.5
@@ -339,38 +275,6 @@ matrix:
339275
directories: $HOME/.ccache
340276

341277
# headless builds for Linux
342-
- os: linux
343-
env:
344-
- MB_PYTHON_VERSION=2.7
345-
- ENABLE_CONTRIB=0
346-
- ENABLE_HEADLESS=1
347-
cache:
348-
directories: $HOME/.ccache
349-
- os: linux
350-
env:
351-
- MB_PYTHON_VERSION=2.7
352-
- UNICODE_WIDTH=16
353-
- ENABLE_CONTRIB=0
354-
- ENABLE_HEADLESS=1
355-
cache:
356-
directories: $HOME/.ccache
357-
- os: linux
358-
env:
359-
- MB_PYTHON_VERSION=2.7
360-
- PLAT=i686
361-
- ENABLE_CONTRIB=0
362-
- ENABLE_HEADLESS=1
363-
cache:
364-
directories: $HOME/.ccache
365-
- os: linux
366-
env:
367-
- MB_PYTHON_VERSION=2.7
368-
- PLAT=i686
369-
- UNICODE_WIDTH=16
370-
- ENABLE_CONTRIB=0
371-
- ENABLE_HEADLESS=1
372-
cache:
373-
directories: $HOME/.ccache
374278
- os: linux
375279
env:
376280
- MB_PYTHON_VERSION=3.5
@@ -439,38 +343,6 @@ matrix:
439343
directories: $HOME/.ccache
440344

441345
# contrib builds for Linux
442-
- os: linux
443-
env:
444-
- MB_PYTHON_VERSION=2.7
445-
- ENABLE_CONTRIB=1
446-
- ENABLE_HEADLESS=0
447-
cache:
448-
directories: $HOME/.ccache
449-
- os: linux
450-
env:
451-
- MB_PYTHON_VERSION=2.7
452-
- UNICODE_WIDTH=16
453-
- ENABLE_CONTRIB=1
454-
- ENABLE_HEADLESS=0
455-
cache:
456-
directories: $HOME/.ccache
457-
- os: linux
458-
env:
459-
- MB_PYTHON_VERSION=2.7
460-
- PLAT=i686
461-
- ENABLE_CONTRIB=1
462-
- ENABLE_HEADLESS=0
463-
cache:
464-
directories: $HOME/.ccache
465-
- os: linux
466-
env:
467-
- MB_PYTHON_VERSION=2.7
468-
- PLAT=i686
469-
- UNICODE_WIDTH=16
470-
- ENABLE_CONTRIB=1
471-
- ENABLE_HEADLESS=0
472-
cache:
473-
directories: $HOME/.ccache
474346
- os: linux
475347
env:
476348
- MB_PYTHON_VERSION=3.5
@@ -540,38 +412,6 @@ matrix:
540412

541413

542414
# headless contrib builds for Linux
543-
- os: linux
544-
env:
545-
- MB_PYTHON_VERSION=2.7
546-
- ENABLE_CONTRIB=1
547-
- ENABLE_HEADLESS=1
548-
cache:
549-
directories: $HOME/.ccache
550-
- os: linux
551-
env:
552-
- MB_PYTHON_VERSION=2.7
553-
- UNICODE_WIDTH=16
554-
- ENABLE_CONTRIB=1
555-
- ENABLE_HEADLESS=1
556-
cache:
557-
directories: $HOME/.ccache
558-
- os: linux
559-
env:
560-
- MB_PYTHON_VERSION=2.7
561-
- PLAT=i686
562-
- ENABLE_CONTRIB=1
563-
- ENABLE_HEADLESS=1
564-
cache:
565-
directories: $HOME/.ccache
566-
- os: linux
567-
env:
568-
- MB_PYTHON_VERSION=2.7
569-
- PLAT=i686
570-
- UNICODE_WIDTH=16
571-
- ENABLE_CONTRIB=1
572-
- ENABLE_HEADLESS=1
573-
cache:
574-
directories: $HOME/.ccache
575415
- os: linux
576416
env:
577417
- MB_PYTHON_VERSION=3.5
@@ -711,7 +551,7 @@ before_cache: |
711551
set +x; set +e
712552
713553
after_success: |
714-
# Upload wheels to pypi if requested
554+
# Upload wheels to pypi if tag is set, otherwise save to Azure Storage
715555
if [ -n "$TRAVIS_TAG" ]; then
716556
set -x
717557
@@ -742,5 +582,16 @@ after_success: |
742582
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
743583
set +x
744584
else
745-
echo "Tag not set, deployment skipped."
585+
set -x
586+
587+
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
588+
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
589+
else
590+
brew install azure-cli
591+
fi
592+
593+
az storage container create -n ${$TRAVIS_COMMIT} --public-access blob
594+
az storage blob upload-batch -d ${$TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern *.whl
595+
596+
set -x
746597
fi

0 commit comments

Comments
 (0)