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

Makefile: remove the "eth2_network_simulation" target 

from the Nimbus Makefile, since it's now in teh nim-beacon-chain one.

Also bump vendor/nim-beacon-chain and vendor/nim-chronos
This commit is contained in:
Ștefan Talpalaru 2019-03-28 16:32:03 +01:00
parent 027fbffc42
commit bb61c08fc2
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -82,7 +82,7 @@ TOOLS_DIRS := premix tests
# comma-separated values for the "clean" target # comma-separated values for the "clean" target
TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS)) TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
.PHONY: all $(TOOLS) deps github-ssh build-nim update status ntags ctags nimbus testsuite test clean mrproper fetch-dlls beacon_node validator_keygen clean_eth2_network_simulation_files eth2_network_simulation test-libp2p-daemon .PHONY: all $(TOOLS) deps github-ssh build-nim update status ntags ctags nimbus testsuite test clean mrproper fetch-dlls test-libp2p-daemon
# default target, because it's the first one that doesn't start with '.' # default target, because it's the first one that doesn't start with '.'
all: $(TOOLS) nimbus all: $(TOOLS) nimbus
@ -139,7 +139,7 @@ test-reproducibility:
# usual cleaning # usual cleaning
clean: clean:
rm -rf build/{nimbus,$(TOOLS_CSV),all_tests,test_rpc,beacon_node,validator_keygen,*.exe} vendor/go/bin \ rm -rf build/{nimbus,$(TOOLS_CSV),all_tests,test_rpc,*.exe} vendor/go/bin \
$(NIMBLE_DIR) $(NIM_BINARY) $(NIM_DIR)/nimcache nimcache $(NIMBLE_DIR) $(NIM_BINARY) $(NIM_DIR)/nimcache nimcache
# dangerous cleaning, because you may have not-yet-pushed branches and commits in those vendor repos you're about to delete # dangerous cleaning, because you may have not-yet-pushed branches and commits in those vendor repos you're about to delete
@ -174,16 +174,6 @@ status: | $(REPOS)
$(eval CMD := $(GIT_STATUS)) $(eval CMD := $(GIT_STATUS))
$(RUN_CMD_IN_ALL_REPOS) $(RUN_CMD_IN_ALL_REPOS)
#- actually binaries, but have them as phony targets to force rebuilds
beacon_node validator_keygen: | build deps
$(ENV_SCRIPT) nim c $(NIM_PARAMS) -o:build/$@ $(REPOS_DIR)/nim-beacon-chain/beacon_chain/$@.nim
clean_eth2_network_simulation_files:
rm -rf $(REPOS_DIR)/nim-beacon-chain/tests/simulation/data
eth2_network_simulation: | beacon_node validator_keygen clean_eth2_network_simulation_files
SKIP_BUILDS=1 $(ENV_SCRIPT) $(REPOS_DIR)/nim-beacon-chain/tests/simulation/start.sh
vendor/go/bin/p2pd: vendor/go/bin/p2pd:
cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \ cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \
$(ENV_SCRIPT) go get ./... && \ $(ENV_SCRIPT) go get ./... && \

2
vendor/nim-beacon-chain vendored

@ -1 +1 @@
Subproject commit 44d9f7d6c9bb24ce9e3f9d9655c09b45f441dd0a Subproject commit f8fbe0ff3bbd54cf304a6fabdd40c2fa585f40b2

2
vendor/nim-chronos vendored

@ -1 +1 @@
Subproject commit 3d87707b0728df6dd37d5fe61f5ce4242eb93b8e Subproject commit 7d63a1b54d2e1ab8fdd0bdbb95d3c84147ccf46f