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

Makefile: try to fix Go version detection in `sanity-checks` 

- set the Go version to 1.12.x for Travis
This commit is contained in:
Ștefan Talpalaru 2019-08-14 22:23:33 +02:00
parent 4daeebbf7e
commit 94a819a5c7
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -1,4 +1,4 @@
language: c language: go
# https://docs.travis-ci.com/user/caching/ # https://docs.travis-ci.com/user/caching/
cache: cache:
@ -13,6 +13,9 @@ git:
# disable LFS file downloading during regular cloning # disable LFS file downloading during regular cloning
lfs_skip_smudge: true lfs_skip_smudge: true
go:
- "1.12.x"
matrix: matrix:
include: include:
- os: linux - os: linux

2
Makefile
View File

@ -23,7 +23,7 @@ $(SILENT_TARGET_PREFIX).SILENT:
sanity-checks: sanity-checks:
@ [[ "$$PWD" =~ /vendor/nim-beacon-chain$ && -e ../../Makefile && -e ../../common.mk ]] || \ @ [[ "$$PWD" =~ /vendor/nim-beacon-chain$ && -e ../../Makefile && -e ../../common.mk ]] || \
{ echo -e "This Makefile can only be used from the corresponding Git submodule in the Nimbus repository.\nDetailed instructions available in README.md or online at https://github.com/status-im/nim-beacon-chain/#building-and-testing"; exit 1; } { echo -e "This Makefile can only be used from the corresponding Git submodule in the Nimbus repository.\nDetailed instructions available in README.md or online at https://github.com/status-im/nim-beacon-chain/#building-and-testing"; exit 1; }
@+ $(MAKE) --silent -C ../../ sanity-checks @+ bash -c "$(MAKE) --silent -C ../../ sanity-checks"
deps: | sanity-checks deps: | sanity-checks
@+ $(MAKE) --silent -C ../../ deps @+ $(MAKE) --silent -C ../../ deps