This is an automated email from the ASF dual-hosted git repository.

klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new e2f943bb1 fix: non-git users can build devlake (#7995)
e2f943bb1 is described below

commit e2f943bb1f7775bac512e158a664978fbfd6cb82
Author: abeizn <[email protected]>
AuthorDate: Tue Sep 3 16:50:26 2024 +0800

    fix: non-git users can build devlake (#7995)
---
 Makefile         | 4 ++--
 backend/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 48ea72487..9417f6505 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@
 # https://stackoverflow.com/questions/920413/make-error-missing-separator
 # https://tutorialedge.net/golang/makefiles-for-go-developers/
 
-SHA ?= $(shell git show -s --format=%h)
-TAG ?= $(shell git tag --points-at HEAD)
+SHA := $(shell if [ -d .git ]; then git show -s --format=%h; else echo 
"default_SHA"; fi)
+TAG := $(shell if [ -d .git ]; then git tag --points-at HEAD; else echo 
"default_TAG"; fi)
 IMAGE_REPO ?= "apache"
 VERSION = $(TAG)@$(SHA)
 
diff --git a/backend/Makefile b/backend/Makefile
index 30807416c..bb321473c 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -17,8 +17,8 @@
 # https://stackoverflow.com/questions/920413/make-error-missing-separator
 # https://tutorialedge.net/golang/makefiles-for-go-developers/
 
-SHA ?= $(shell git show -s --format=%h)
-TAG ?= $(shell git tag --points-at HEAD)
+SHA := $(shell if [ -d .git ]; then git show -s --format=%h; else echo 
"default_SHA"; fi)
+TAG := $(shell if [ -d .git ]; then git tag --points-at HEAD; else echo 
"default_TAG"; fi)
 IMAGE_REPO ?= "apache"
 VERSION = $(TAG)@$(SHA)
 PYTHON_DIR ?= "./python"

Reply via email to