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

Merge branch 'buildsys'

This commit is contained in:
Ștefan Talpalaru 2019-09-04 22:44:20 +02:00
parent ad240953ed 9547553066
commit cf12a78503
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -61,13 +61,13 @@ p2pd: | go-checks
# Windows 10 with WSL enabled, but no distro installed, fails if "../../nimble.sh" is executed directly
# in a Makefile recipe but works when prefixing it with `bash`. No idea how the PATH is overridden.
DISABLE_LFS_SCRIPT := 0
test: | build deps nat-libs p2pd
test: | build deps p2pd
ifeq ($(DISABLE_LFS_SCRIPT), 0)
V=$(V) scripts/process_lfs.sh
endif
$(ENV_SCRIPT) nim test $(NIM_PARAMS) beacon_chain.nims && rm -f 0000-*.json
$(TOOLS): | build deps nat-libs p2pd
$(TOOLS): | build deps p2pd
for D in $(TOOLS_DIRS); do [ -e "$${D}/$@.nim" ] && TOOL_DIR="$${D}" && break; done && \
echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim c $(NIM_PARAMS) -o:build/$@ "$${TOOL_DIR}/$@.nim"
@ -75,10 +75,10 @@ $(TOOLS): | build deps nat-libs p2pd
clean_eth2_network_simulation_files:
rm -rf tests/simulation/{data,validators}
eth2_network_simulation: | build deps nat-libs p2pd clean_eth2_network_simulation_files
eth2_network_simulation: | build deps p2pd clean_eth2_network_simulation_files
GIT_ROOT="$$PWD" BUILD_OUTPUTS_DIR="./build" $(ENV_SCRIPT) tests/simulation/start.sh
testnet0 testnet1: | build deps nat-libs p2pd
testnet0 testnet1: | build deps p2pd
NIM_PARAMS="$(NIM_PARAMS)" $(ENV_SCRIPT) scripts/build_testnet_node.sh $@
clean-testnet0:

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 705c897ee79f80ffc81aae9f6cb42bdc9a0a78c8
Subproject commit 178ded44a307a479e77e4dafacddc594fff8ba4c