From 8ebe13692448f419c7a6e679ec9a158a706fc56b Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Mon, 7 Dec 2020 16:19:55 +0000 Subject: [PATCH] display release type instead of keys --- core/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index cbfe52232e..a7cc2e2513 100644 --- a/core/Makefile +++ b/core/Makefile @@ -226,7 +226,15 @@ BUILD_KEYS := test-keys else BUILD_KEYS := dev-keys endif -BUILD_VERSION_TAGS += $(BUILD_KEYS) + +ifndef RELEASE_TYPE + BUILD_DISPLAY_KEYS := $(BUILD_KEYS) +else + BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys +endif + +BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS) + BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) # A human-readable string that descibes this build in detail. @@ -281,9 +289,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user) # Dev. branches should have DISPLAY_BUILD_NUMBER set ifeq (true,$(DISPLAY_BUILD_NUMBER)) - BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) + BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS) else - BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) + BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS) endif else # Non-user builds should show detailed build information -- GitLab