Merge branch 'master' of github.com:status-im/nim-libp2p

This commit is contained in:
cheatfate 2019-08-25 10:10:14 +03:00
commit 4f5e2347d3
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95
2 changed files with 4 additions and 2 deletions

View File

@ -40,7 +40,7 @@ install:
# build nim from our own branch - this to avoid the day-to-day churn and # build nim from our own branch - this to avoid the day-to-day churn and
# regressions of the fast-paced Nim development while maintaining the # regressions of the fast-paced Nim development while maintaining the
# flexibility to apply patches # flexibility to apply patches
- curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus/devel/build_nim.sh - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
- env MAKE="mingw32-make -j2" ARCH_OVERRIDE=%PLATFORM% bash build_nim.sh Nim csources dist/nimble NimBinaries - env MAKE="mingw32-make -j2" ARCH_OVERRIDE=%PLATFORM% bash build_nim.sh Nim csources dist/nimble NimBinaries
- SET PATH=%CD%\Nim\bin;%PATH% - SET PATH=%CD%\Nim\bin;%PATH%
@ -52,3 +52,4 @@ test_script:
- nimble test - nimble test
deploy: off deploy: off

View File

@ -24,9 +24,10 @@ install:
# build nim from our own branch - this to avoid the day-to-day churn and # build nim from our own branch - this to avoid the day-to-day churn and
# regressions of the fast-paced Nim development while maintaining the # regressions of the fast-paced Nim development while maintaining the
# flexibility to apply patches # flexibility to apply patches
- curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus/devel/build_nim.sh - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
- env MAKE="make -j2" bash build_nim.sh Nim csources dist/nimble NimBinaries - env MAKE="make -j2" bash build_nim.sh Nim csources dist/nimble NimBinaries
- export PATH="$PWD/Nim/bin:$GOPATH/bin:$PATH" - export PATH="$PWD/Nim/bin:$GOPATH/bin:$PATH"
- git clone https://github.com/libp2p/go-libp2p-daemon - git clone https://github.com/libp2p/go-libp2p-daemon
- cd go-libp2p-daemon - cd go-libp2p-daemon
# - git checkout v0.0.1 # - git checkout v0.0.1