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

Add nimbus-eth2 as submodule. Add launch_local_testnet script to CI.

This commit is contained in:
Nikolay Mitev 2022-08-16 13:06:45 +03:00 committed by zah
parent 5f2117d081
commit 1e4f138574
4 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -288,6 +288,11 @@ jobs:
# hide CI failures # hide CI failures
env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test || true env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test || true
else else
pushd vendor/nimbus-eth2
env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
--disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
popd
env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test
fi fi
@ -299,5 +304,10 @@ jobs:
make ${DEFAULT_MAKE_FLAGS} make ${DEFAULT_MAKE_FLAGS}
build/nimbus --help build/nimbus --help
# "-static" option will not work for osx unless static system libraries are provided # "-static" option will not work for osx unless static system libraries are provided
pushd vendor/nimbus-eth2
env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
--disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
popd
make ${DEFAULT_MAKE_FLAGS} test make ${DEFAULT_MAKE_FLAGS} test

4
.gitmodules vendored
View File

@ -173,3 +173,7 @@
url = https://github.com/status-im/nim-ssz-serialization.git url = https://github.com/status-im/nim-ssz-serialization.git
ignore = untracked ignore = untracked
branch = master branch = master
[submodule "vendor/nimbus-eth2"]
path = vendor/nimbus-eth2
url = https://github.com/status-im/nimbus-eth2.git
branch = unstable

32
Makefile
View File

@ -12,6 +12,38 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system
LINK_PCRE := 0 LINK_PCRE := 0
EXCLUDED_NIM_PACKAGES := \
vendor/nimbus-eth2/vendor/nim-bearssl \
vendor/nimbus-eth2/vendor/nim-blscurve \
vendor/nimbus-eth2/vendor/nim-bearssl \
vendor/nimbus-eth2/vendor/nim-blscurve \
vendor/nimbus-eth2/vendor/nimbus-build-system \
vendor/nimbus-eth2/vendor/nim-chronicles \
vendor/nimbus-eth2/vendor/nim-chronos \
vendor/nimbus-eth2/vendor/nim-confutils \
vendor/nimbus-eth2/vendor/nimcrypto \
vendor/nimbus-eth2/vendor/nim-eth \
vendor/nimbus-eth2/vendor/nim-faststreams \
vendor/nimbus-eth2/vendor/nim-http-utils \
vendor/nimbus-eth2/vendor/nim-json-rpc \
vendor/nimbus-eth2/vendor/nim-json-serialization\
vendor/nimbus-eth2/vendor/nim-libbacktrace \
vendor/nimbus-eth2/vendor/nim-metrics \
vendor/nimbus-eth2/vendor/nim-nat-traversal \
vendor/nimbus-eth2/vendor/nim-secp256k1 \
vendor/nimbus-eth2/vendor/nim-serialization \
vendor/nimbus-eth2/vendor/nim-snappy \
vendor/nimbus-eth2/vendor/nim-sqlite3-abi \
vendor/nimbus-eth2/vendor/nim-ssz-serialization \
vendor/nimbus-eth2/vendor/nim-stew \
vendor/nimbus-eth2/vendor/nim-stint \
vendor/nimbus-eth2/vendor/nim-testutils \
vendor/nimbus-eth2/vendor/nim-toml-serialization\
vendor/nimbus-eth2/vendor/nim-unittest2 \
vendor/nimbus-eth2/vendor/nim-web3 \
vendor/nimbus-eth2/vendor/nim-websock \
vendor/nimbus-eth2/vendor/nim-zlib
# we don't want an error here, so we can handle things later, in the ".DEFAULT" target # we don't want an error here, so we can handle things later, in the ".DEFAULT" target
-include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk -include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk

1
vendor/nimbus-eth2 vendored Submodule

@ -0,0 +1 @@
Subproject commit 5c91d29df0eebff2e3ea10d5adf99943545c8b1a