From 3a20020264842679629c46efed391518fcfb5096 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 30 Apr 2019 16:15:57 +0200 Subject: [PATCH] [ci] extend timeout for vcpkg, add all vcpkg configs to allowed failures --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d1b2988ff9..4a0b50fadee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -893,6 +893,8 @@ matrix: #do not consider known failing builds for the whole build status allow_failures: - name: macOS - vcpkg + - name: ubuntu 14.04 - gcc@8.0 - vcpkg + - name: ubuntu 14.04 - gcc@8.0 - CUDA 10 - vcpkg before_install: - travis_retry eval "${MATRIX_EVAL}" @@ -908,9 +910,8 @@ install: - git pull - if [ "${USE_VCPKG}" = true ] ; then ./bootstrap-vcpkg.sh ; fi - if [ "${USE_VCPKG}" = true ] ; then travis_wait ./vcpkg install stb pthreads ; fi - #- if [ "${USE_VCPKG}" = true ] && [[ ! -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg,cuda] ; fi - #- if [ "${USE_VCPKG}" = true ] && [[ -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg] ; fi - - if [ "${USE_VCPKG}" = true ] ; then travis_wait ./vcpkg install opencv[ffmpeg] ; fi + - if [ "${USE_VCPKG}" = true ] && [[ ! -z "${CUDACXX}" ]] ; then travis_wait 45 ./vcpkg install opencv[ffmpeg,cuda] ; fi + - if [ "${USE_VCPKG}" = true ] && [[ -z "${CUDACXX}" ]] ; then travis_wait 45 ./vcpkg install opencv[ffmpeg] ; fi - popd before_script: