From 94e5e4975399ef85a9a9fce2208f9f2bba517e2e Mon Sep 17 00:00:00 2001 From: Giorgi Bochorishvili Date: Mon, 23 Jan 2023 16:17:24 +0400 Subject: [PATCH] Add build hash to makefile --- Makefile | 14 ++++++++++++++ config/client.go | 1 + model/version.go | 1 + 3 files changed, 16 insertions(+) diff --git a/Makefile b/Makefile index aa08613ceb..385f8e3f60 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,18 @@ endif # Playbooks BUILD_PLAYBOOKS_DIR ?= ../mattermost-plugin-playbooks BUILD_PLAYBOOKS ?= false +BUILD_HASH_PLAYBOOKS = none + +ifneq ($(wildcard $(BUILD_PLAYBOOKS_DIR)/.),) + ifeq ($(BUILD_PLAYBOOKS),true) + BUILD_PLAYBOOKS = true + BUILD_HASH_PLAYBOOKS = $(shell cd $(BUILD_PLAYBOOKS_DIR) && git rev-parse HEAD) + else + BUILD_PLAYBOOKS = false + endif +else + BUILD_PLAYBOOKS = false +endif ifeq ($(BUILD_PLAYBOOKS),true) IGNORE:=$(shell cp $(BUILD_PLAYBOOKS_DIR)/product/imports/playbooks_imports.go imports/) @@ -208,6 +220,8 @@ else IGNORE:=$(shell rm -f imports/playbooks_imports.go) endif +LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashPlaybooks=$(BUILD_HASH_PLAYBOOKS)" + all: run ## Alias for 'run'. -include config.override.mk diff --git a/config/client.go b/config/client.go index 047d9eef1a..589a88688b 100644 --- a/config/client.go +++ b/config/client.go @@ -225,6 +225,7 @@ func GenerateLimitedClientConfig(c *model.Config, telemetryID string, license *m props["BuildEnterpriseReady"] = model.BuildEnterpriseReady props["BuildHashBoards"] = model.BuildHashBoards props["BuildBoards"] = model.BuildBoards + props["BuildHashPlaybooks"] = model.BuildHashPlaybooks props["EnableBotAccountCreation"] = strconv.FormatBool(*c.ServiceSettings.EnableBotAccountCreation) props["EnableFile"] = strconv.FormatBool(*c.LogSettings.EnableFile) diff --git a/model/version.go b/model/version.go index 6090666ca3..be9168d9b2 100644 --- a/model/version.go +++ b/model/version.go @@ -117,6 +117,7 @@ var BuildHashEnterprise string var BuildEnterpriseReady string var BuildHashBoards string var BuildBoards string +var BuildHashPlaybooks string var versionsWithoutHotFixes []string func init() {