diff --git a/docker/dist/README.md b/docker/dist/README.md index 6e9d8cb8d..446288fcf 100644 --- a/docker/dist/README.md +++ b/docker/dist/README.md @@ -2,7 +2,7 @@ This binary distribution was created from https://github.com/status-im/nimbus-eth2 -Tarball naming scheme: "nimbus-eth2\_Linux\_amd64\_\_.tar.gz" (the date is in UTC). +Tarball naming scheme: "nimbus-eth2\_Linux\_amd64\_\_\_.tar.gz" (the date is in UTC). ## Reproducing the build diff --git a/docker/dist/entry_point.sh b/docker/dist/entry_point.sh index c62982865..3a733bcd1 100755 --- a/docker/dist/entry_point.sh +++ b/docker/dist/entry_point.sh @@ -4,20 +4,24 @@ set -e cd /home/user/nimbus-eth2 -PREFIX="nimbus-eth2_Linux_amd64_" -GIT_COMMIT="$(git rev-parse --short HEAD)" -DIR="${PREFIX}${GIT_COMMIT}_$(date --utc +'%Y%m%d%H%M%S')" -DIST_PATH="dist/${DIR}" BINARIES="beacon_node medalla_beacon_node" -# delete old artefacts -rm -rf "dist/${PREFIX}"*.tar.gz - -mkdir -p "${DIST_PATH}" - # we need to build everything against libraries available inside this container, including the Nim compiler make clean make -j$(nproc) LOG_LEVEL="TRACE" NIMFLAGS="-d:disableMarchNative" PARTIAL_STATIC_LINKING=1 ${BINARIES} + +# archive directory (we need the Nim compiler in here) +PREFIX="nimbus-eth2_Linux_amd64_" +GIT_COMMIT="$(git rev-parse --short HEAD)" +VERSION="$(./env.sh nim --verbosity:0 --hints:off --warnings:off scripts/print_version.nims)" +TIMESTAMP="$(date --utc +'%Y%m%d%H%M%S')" +DIR="${PREFIX}${VERSION}_${GIT_COMMIT}_${TIMESTAMP}" +DIST_PATH="dist/${DIR}" +# delete old artefacts +rm -rf "dist/${PREFIX}"*.tar.gz +mkdir -p "${DIST_PATH}" + +# copy and checksum binaries, copy scripts and docs for BINARY in ${BINARIES}; do cp -a ./build/${BINARY} "${DIST_PATH}/" cd "${DIST_PATH}" @@ -27,6 +31,7 @@ for BINARY in ${BINARIES}; do done sed -e "s/GIT_COMMIT/${GIT_COMMIT}/" docker/dist/README.md > "${DIST_PATH}/README.md" cp -a scripts/makedir.sh docker/dist/run_medalla_node.sh "${DIST_PATH}/" +cp -a docs/the_nimbus_book "${DIST_PATH}/" # create the tarball cd dist diff --git a/scripts/print_version.nims b/scripts/print_version.nims new file mode 100644 index 000000000..60debf524 --- /dev/null +++ b/scripts/print_version.nims @@ -0,0 +1,4 @@ +import ../beacon_chain/version + +echo versionAsStr +