status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 21:34:33 +00:00
Code Issues Projects Releases Wiki Activity

For some reason, git's env variables are not defined inside the docker build env

Browse Source
This commit is contained in:
Zahary Karadjov 2019-06-20 19:03:03 +03:00
parent eb825051fd
commit 7785b31431
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -114,8 +114,8 @@ endif
# for runtime path (i.e.: the second line in $(NIMBLE_DIR)/pkgs/*/*.nimble-link) # for runtime path (i.e.: the second line in $(NIMBLE_DIR)/pkgs/*/*.nimble-link)
$(NIMBLE_DIR): | $(NIM_BINARY) $(NIMBLE_DIR): | $(NIM_BINARY)
mkdir -p $(NIMBLE_DIR)/pkgs mkdir -p $(NIMBLE_DIR)/pkgs
NIMBLE_DIR="$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \ NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \
git submodule foreach --quiet 'bash $(CURDIR)/scripts/create_nimble_link.sh' git submodule foreach --quiet 'bash $(CURDIR)/scripts/create_nimble_link.sh "$$sm_path"'
# symlink # symlink
nimbus.nims: nimbus.nims:

6
scripts/create_nimble_link.sh
View File

@ -1,11 +1,13 @@
set -u set -u
module_name="${1#*/}"
if [ `ls -1 *.nimble 2>/dev/null | wc -l ` -gt 0 ]; then if [ `ls -1 *.nimble 2>/dev/null | wc -l ` -gt 0 ]; then
mkdir -p "$toplevel/${NIMBLE_DIR}/pkgs/${sm_path#*/}-#head" mkdir -p "${NIMBLE_DIR}/pkgs/${module_name}-#head"
PKG_DIR="$(${PWD_CMD})" PKG_DIR="$(${PWD_CMD})"
if [ -d src ]; then if [ -d src ]; then
PKG_DIR="${PKG_DIR}/src" PKG_DIR="${PKG_DIR}/src"
fi fi
echo -e "${PKG_DIR}\n${PKG_DIR}" > "$toplevel/${NIMBLE_DIR}/pkgs/${sm_path#*/}-#head/${sm_path#*/}.nimble-link" echo -e "${PKG_DIR}\n${PKG_DIR}" > "${NIMBLE_DIR}/pkgs/${module_name}-#head/${module_name}.nimble-link"
fi fi

2
vendor/nim-json-rpc vendored

@ -1 +1 @@
Subproject commit 187a670d9792a3c20c2db1753e9c93635594e048 Subproject commit 9d0326aad41c0efdc83b5612e76f7a493d82f27d