CI: use build_p2pd.sh for download retries and caching

This commit is contained in:
Ștefan Talpalaru 2019-08-25 15:55:26 +02:00
parent 53fb5924ea
commit ead8b4cc38
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 16 additions and 20 deletions

View File

@ -3,7 +3,8 @@ version: '{build}'
image: Visual Studio 2015 image: Visual Studio 2015
cache: cache:
- NimBinaries - NimBinaries
- p2pdCache
matrix: matrix:
# We always want 32 and 64-bit compilation # We always want 32 and 64-bit compilation
@ -23,6 +24,13 @@ install:
- IF "%PLATFORM%" == "x86" SET PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH% - IF "%PLATFORM%" == "x86" SET PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%
- IF "%PLATFORM%" == "x64" SET PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH% - IF "%PLATFORM%" == "x64" SET PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%
# 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
# flexibility to apply patches
- 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
- SET PATH=%CD%\Nim\bin;%PATH%
# set path for produced Go binaries # set path for produced Go binaries
- MKDIR goblin - MKDIR goblin
- CD goblin - CD goblin
@ -31,22 +39,11 @@ install:
- CD .. - CD ..
# install and build go-libp2p-daemon # install and build go-libp2p-daemon
- go version - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
- git clone https://github.com/libp2p/go-libp2p-daemon - bash build_p2pd.sh p2pdCache
- CD go-libp2p-daemon
- go install ./...
- CD ..
# 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
# flexibility to apply patches
- 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
- SET PATH=%CD%\Nim\bin;%PATH%
build_script: build_script:
- cd C:\projects\%APPVEYOR_PROJECT_SLUG% - nimble install -y --depsOnly
- nimble install -y
test_script: test_script:
- nimble test - nimble test

View File

@ -4,6 +4,7 @@ language: go
cache: cache:
directories: directories:
- NimBinaries - NimBinaries
- p2pdCache
git: git:
# when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X" # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
@ -28,11 +29,9 @@ install:
- 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 # install and build go-libp2p-daemon
- cd go-libp2p-daemon - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
# - git checkout v0.0.1 - bash build_p2pd.sh p2pdCache
- go install ./...
- cd $HOME/build/status-im/nim-libp2p
script: script:
- nimble install -y --depsOnly - nimble install -y --depsOnly