From dcc57deebfcc15ba44f94d8742ad2263adfa584c Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 31 Jul 2019 10:25:23 +0100 Subject: [PATCH 1/4] Use travis_wait because builds/linkers are slow --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0bf87da63..5a3a3f7a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,11 +93,11 @@ before_install: script: - if [ "$TRAVIS_OS_NAME" == "windows" ]; then - 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 - docker build -f $DOCKER_FILE .; + travis_wait docker build -f $DOCKER_FILE .; else - make ${MAKE_TARGET:-test}; + travis_wait make ${MAKE_TARGET:-test}; fi after_script: From 94b10a8a7d409528df8b58a095f19e18f8761746 Mon Sep 17 00:00:00 2001 From: michael-loki Date: Wed, 31 Jul 2019 12:48:56 +0100 Subject: [PATCH 2/4] Try bumping to 30 minutes wait --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a3a3f7a4..0f4142c48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,11 +93,11 @@ before_install: script: - if [ "$TRAVIS_OS_NAME" == "windows" ]; then - travis_wait cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 && make test'; + travis_wait 30 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 docker build -f $DOCKER_FILE .; + travis_wait 30 docker build -f $DOCKER_FILE .; else - travis_wait make ${MAKE_TARGET:-test}; + travis_wait 30 make ${MAKE_TARGET:-test}; fi after_script: From aaba30b82d4e71bdbe5c5d9520c7dfd08bee7fb4 Mon Sep 17 00:00:00 2001 From: michael-loki Date: Wed, 31 Jul 2019 23:19:59 +0100 Subject: [PATCH 3/4] Go back to 20 minutes, don't let this job block CI --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f4142c48..93f251da9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: From 650cf49e8ed04aab8496461cdc44120a0b3b7a44 Mon Sep 17 00:00:00 2001 From: michael-loki Date: Wed, 31 Jul 2019 23:26:11 +0100 Subject: [PATCH 4/4] ugh travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 93f251da9..8b9c6eff3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ 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