Go back to 20 minutes, don't let this job block CI

pull/744/head
michael-loki 5 years ago committed by GitHub
parent 94b10a8a7d
commit aaba30b82d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -12,10 +12,6 @@ matrix:
dist: xenial
env: DOCKER_FILE=docker/router.Dockerfile
services: docker
- os: linux
dist: xenial
env: DOCKER_FILE=docker/alpine-windows.Dockerfile
services: docker
- os: linux
dist: xenial
compiler: gcc
@ -52,6 +48,11 @@ matrix:
env: BUILD_TYPE=Debug
- os: windows
env: BUILD_TYPE=Release
allow_failures:
- os: linux
dist: xenial
env: DOCKER_FILE=docker/alpine-windows.Dockerfile
services: docker
env:
global:
@ -93,11 +94,11 @@ before_install:
script:
- if [ "$TRAVIS_OS_NAME" == "windows" ]; then
travis_wait 30 cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 && make test';
travis_wait cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 && make test';
elif [[ ! -z $DOCKER_FILE ]]; then
travis_wait 30 docker build -f $DOCKER_FILE .;
travis_wait docker build -f $DOCKER_FILE .;
else
travis_wait 30 make ${MAKE_TARGET:-test};
travis_wait make ${MAKE_TARGET:-test};
fi
after_script:

Loading…
Cancel
Save