- disable native Windows paths

- remove nim-beacon-chain CI test on Windows (not yet supported)
This commit is contained in:
Ștefan Talpalaru 2019-03-28 21:28:36 +01:00
parent f2bcf35949
commit 63d95c3145
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 5 additions and 3 deletions

View File

@ -30,7 +30,6 @@ test_script:
- build\nimbus.exe --help - build\nimbus.exe --help
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0 NIMFLAGS="-d:release" test - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0 NIMFLAGS="-d:release" test
- IF "%PLATFORM%" == "x64" mingw32-make -j2 test-reproducibility - IF "%PLATFORM%" == "x64" mingw32-make -j2 test-reproducibility
- mingw32-make -C vendor/nim-beacon-chain -j2 V=0 test
deploy: off deploy: off

7
env.sh
View File

@ -5,13 +5,16 @@ PWD_CMD="pwd"
uname | grep -qi mingw && PWD_CMD="pwd -W" uname | grep -qi mingw && PWD_CMD="pwd -W"
rel_path="$(dirname $0)" rel_path="$(dirname $0)"
abs_path="$(cd $rel_path; ${PWD_CMD})" abs_path="$(cd $rel_path; pwd)"
# do we still need this?
abs_path_native="$(cd $rel_path; ${PWD_CMD})"
# used by libp2p/go-libp2p-daemon # used by libp2p/go-libp2p-daemon
export GOPATH="${abs_path}/vendor/go" export GOPATH="${abs_path}/vendor/go"
export GO111MODULE=on export GO111MODULE=on
# make it an absolute path, so we can call this script from other dirs #- make it an absolute path, so we can call this script from other dirs
#- we can't use native Windows paths in here, because colons can't be escaped in PATH
export PATH="${abs_path}/vendor/Nim/bin:${GOPATH}/bin:${PATH}" export PATH="${abs_path}/vendor/Nim/bin:${GOPATH}/bin:${PATH}"
# Nimble needs this to be an absolute path # Nimble needs this to be an absolute path