CI: Fix git.mk & post a quick flash link on PR builds (#670)
* CI: Fix git.mk & post a quick flash link on PR builds * Makefile: optimize shell invocation in git helper, conditional dependency load. * Github: better variable naming Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
20
make/git.mk
20
make/git.mk
@@ -1,9 +1,13 @@
|
||||
GIT_COMMIT = $(shell git describe --always --exclude '*' || echo 'unknown')
|
||||
GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD || echo 'unknown')
|
||||
GIT_BRANCH_NUM = $(shell git rev-list --count $(GIT_BRANCH) || echo 'nan')
|
||||
BUILD_DATE = $(shell date '+%d-%m-%Y' || echo 'unknown')
|
||||
VERSION = $(shell git describe --tags --abbrev=0 || echo 'unknown')
|
||||
|
||||
CFLAGS += -DGIT_COMMIT="\"$(GIT_COMMIT)\"" -DGIT_BRANCH="\"$(GIT_BRANCH)\"" -DGIT_BRANCH_NUM="\"$(GIT_BRANCH_NUM)\""
|
||||
CFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\"" -DTARGET="\"$(TARGET)\"" -DVERSION="\"$(VERSION)\""
|
||||
GIT_COMMIT := $(shell git rev-parse --short HEAD || echo 'unknown')
|
||||
GIT_BRANCH := $(shell echo $${WORKFLOW_BRANCH_OR_TAG-$$(git rev-parse --abbrev-ref HEAD || echo 'unknown')})
|
||||
GIT_BRANCH_NUM := $(shell git rev-list --count HEAD || echo 'nan')
|
||||
BUILD_DATE := $(shell date '+%d-%m-%Y' || echo 'unknown')
|
||||
VERSION := $(shell git describe --tags --abbrev=0 --exact-match || echo 'unknown')
|
||||
|
||||
CFLAGS += \
|
||||
-DGIT_COMMIT="\"$(GIT_COMMIT)\"" \
|
||||
-DGIT_BRANCH="\"$(GIT_BRANCH)\"" \
|
||||
-DGIT_BRANCH_NUM="\"$(GIT_BRANCH_NUM)\"" \
|
||||
-DBUILD_DATE="\"$(BUILD_DATE)\"" \
|
||||
-DTARGET="\"$(TARGET)\"" \
|
||||
-DVERSION="\"$(VERSION)\""
|
||||
|
@@ -127,4 +127,6 @@ generate_cscope_db:
|
||||
@rm -rf $(OBJ_DIR)/source.list $(OBJ_DIR)/source.list.p
|
||||
|
||||
|
||||
ifneq ("$(wildcard $(OBJ_DIR)/*.d)","")
|
||||
-include $(DEPS)
|
||||
endif
|
||||
|
Reference in New Issue
Block a user