status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'macos' into devel

This commit is contained in:
Ștefan Talpalaru 2019-08-07 21:46:34 +02:00
parent 1b1ea52c89 c22c1d303f
commit a9314f1c05
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@ -39,6 +39,7 @@ test_script:
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% test - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% 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 test - mingw32-make -C vendor/nim-beacon-chain -j2 test
- mingw32-make go-checks
deploy: off deploy: off

1
.travis.yml
View File

@ -32,4 +32,5 @@ script:
- ./build/nimbus --help - ./build/nimbus --help
- make -j2 test test-reproducibility - make -j2 test test-reproducibility
- make -C vendor/nim-beacon-chain -j2 test - make -C vendor/nim-beacon-chain -j2 test
- make go-checks

2
Makefile
View File

@ -185,7 +185,7 @@ status: | $(REPOS)
MIN_GO_VER := 1.12.0 MIN_GO_VER := 1.12.0
go-checks: go-checks:
which go &>/dev/null || { echo "Go compiler not installed. Aborting."; exit 1; } which go &>/dev/null || { echo "Go compiler not installed. Aborting."; exit 1; }
GO_VER="$$(go version | sed 's/^.*go\(\S\+\).*$$/\1/')"; \ GO_VER="$$(go version | sed -E 's/^.*go([0-9.]+).*$$/\1/')"; \
[[ $$(echo -e "$${GO_VER}\n$(MIN_GO_VER)" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | head -n 1) == "$(MIN_GO_VER)" ]] || \ [[ $$(echo -e "$${GO_VER}\n$(MIN_GO_VER)" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | head -n 1) == "$(MIN_GO_VER)" ]] || \
{ echo "Minimum Go compiler version required: $(MIN_GO_VER). Version available: $$GO_VER. Aborting."; exit 1; } { echo "Minimum Go compiler version required: $(MIN_GO_VER). Version available: $$GO_VER. Aborting."; exit 1; }