分支名称由CI环境变量提供。

This commit is contained in:
Lu Qiuwen
2021-06-03 15:53:28 +08:00
parent 4bfe68a116
commit 6f4fb0e0bc

View File

@@ -48,16 +48,21 @@ OS_BUILD_TIME := $(subst +,$e,$(OS_BUILD_TIME))
OS_BUILD_HASH := $(subst ",$e,$(VCS_SHORT_HASH))
OS_BUILD_TAG := $(subst ",$e,$(VCS_TAG))
OS_BUILD_BRANCH := $(subst -,_,$(VCS_BRANCH))
ifeq ($(CI_COMMIT_BRANCH),)
OS_BUILD_BRANCH := $(subst -,_,$(VCS_BRANCH))
else
OS_BUILD_BRANCH := $(subst -,_,$(CI_COMMIT_BRANCH))
endif
ifeq ($(OS_BUILD_TAG),)
OS_BUILD_TAG := $(OS_BUILD_TIME)
OS_BUILD_TAG := $(OS_BUILD_TIME)
endif
ifeq ($(DALIY_BUILD_VERSION),1)
OS_RELEASE_VER = $(OS_BUILD_BRANCH)-$(OS_BUILD_TIME)-$(OS_BUILD_HASH)
OS_RELEASE_VER = $(OS_BUILD_BRANCH)-$(OS_BUILD_TIME)-$(OS_BUILD_HASH)
else
OS_RELEASE_VER = $(OS_BUILD_TAG)-$(OS_BUILD_HASH)
OS_RELEASE_VER = $(OS_BUILD_TAG)-$(OS_BUILD_HASH)
endif
ifndef PROFILE_LIST