mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-10-31 09:20:21 +00:00
Merge pull request #744 from michael-loki/travis_wait
Use travis_wait because builds/linkers are slow
This commit is contained in:
commit
b5db869baa
11
.travis.yml
11
.travis.yml
@ -52,6 +52,11 @@ matrix:
|
|||||||
env: BUILD_TYPE=Debug
|
env: BUILD_TYPE=Debug
|
||||||
- os: windows
|
- os: windows
|
||||||
env: BUILD_TYPE=Release
|
env: BUILD_TYPE=Release
|
||||||
|
allow_failures:
|
||||||
|
- os: linux
|
||||||
|
dist: xenial
|
||||||
|
env: DOCKER_FILE=docker/alpine-windows.Dockerfile
|
||||||
|
services: docker
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
@ -93,11 +98,11 @@ before_install:
|
|||||||
|
|
||||||
script:
|
script:
|
||||||
- if [ "$TRAVIS_OS_NAME" == "windows" ]; then
|
- 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
|
elif [[ ! -z $DOCKER_FILE ]]; then
|
||||||
docker build -f $DOCKER_FILE .;
|
travis_wait docker build -f $DOCKER_FILE .;
|
||||||
else
|
else
|
||||||
make ${MAKE_TARGET:-test};
|
travis_wait make ${MAKE_TARGET:-test};
|
||||||
fi
|
fi
|
||||||
|
|
||||||
after_script:
|
after_script:
|
||||||
|
Loading…
Reference in New Issue
Block a user