From 6f4fb0e0bcd141bfe90076bc4d179c4b0200f4fc Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Thu, 3 Jun 2021 15:53:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=8D=E7=A7=B0=E7=94=B1CI?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=8F=90=E4=BE=9B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 61c9962b..776054a3 100644 --- a/Makefile +++ b/Makefile @@ -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