build: check node module location to determine need to build or downl…

…oad binary Signed-off-by: Artur Troian <[email protected]>
DappWiz · Aug 30, 2023 · 6d0fac8 · 6d0fac8
1 parent 4fc5400
commit 6d0fac8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/make/init.mk b/make/init.mk
@@ -116,6 +116,8 @@ ifeq (false,$(AKASHD_SRC_IS_LOCAL))
 	  -H "Authorization: Bearer $${GITHUB_TOKEN}" \
 	  -H "X-GitHub-Api-Version: 2022-11-28" \
 	  https://api.github.com/repos/akash-network/node/releases/tags/$(AKASHD_VERSION) | jq -e --arg name "akash_darwin_all.zip" '.assets[] | select(.name==$$name)' > /dev/null 2>&1 && echo -n true || echo -n false)
+else
+	AKASHD_BUILD_FROM_SRC := true
 endif
 
 RELEASE_DOCKER_IMAGE         ?= ghcr.io/akash-network/provider

diff --git a/make/setup-cache.mk b/make/setup-cache.mk
@@ -25,6 +25,10 @@ ifeq ($(UNAME_OS_LOWER), darwin)
 	AKASH_INSTALL_ARCH := all
 endif
 
+.PHONY: akash-rm
+akash-rm:
+	rm -f $(AKASHD_VERSION_FILE)
+
 .PHONY: akash
 ifeq ($(AKASHD_BUILD_FROM_SRC), true)
 akash:
@@ -41,7 +45,7 @@ $(AKASHD_VERSION_FILE): $(AP_DEVCACHE)
 	rm -rf "$(dir $@)"
 	mkdir -p "$(dir $@)"
 	touch $@
-akash: $(AKASHD_VERSION_FILE)
+akash: akash-rm $(AKASHD_VERSION_FILE)
 endif
 
 $(STATIK_VERSION_FILE): $(AP_DEVCACHE)

diff --git a/script/is_local_gomod.sh b/script/is_local_gomod.sh
@@ -2,4 +2,4 @@
 
 MOD_PATH=$(go list -mod=readonly -m -f '{{ .Replace }}' "$1" 2>/dev/null | grep -v -x -F "<nil>")
 
-[[ "${MOD_PATH}" = /* ]] && echo -n true || echo -n false
+[[ "${MOD_PATH}" =~ ^(\/|\.\/|\.\.\/).*$ ]] && echo -n true || echo -n false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		MOD_PATH=$(go list -mod=readonly -m -f '{{ .Replace }}' "$1" 2>/dev/null \| grep -v -x -F "<nil>")

		[[ "${MOD_PATH}" = /* ]] && echo -n true \|\| echo -n false
		[[ "${MOD_PATH}" =~ ^(\/\|\.\/\|\.\.\/).*$ ]] && echo -n true \|\| echo -n false