From 0c0d795de47e632f2e10be3e50299b70d6e32ec2 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Mon, 7 Dec 2020 16:19:49 +0000 Subject: [PATCH] display release type instead of keys --- core/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index eb0febb1f7..d6bd88d597 100644 --- a/core/Makefile +++ b/core/Makefile @@ -171,7 +171,14 @@ 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. @@ -219,9 +226,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