Remove Webapp Build Hash (#22706)
* Remove Webapp Build Hash A discrete webapp build hash is no longer needed with the mono-repo. * i18n-extract
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
8cc7d7ba4a
Коммит
64051134b8
@@ -87,14 +87,8 @@ else
|
||||
endif
|
||||
|
||||
# Boards
|
||||
BUILD_BOARDS = true
|
||||
BUILD_HASH_BOARDS = $(BUILD_HASH)
|
||||
export MM_FEATUREFLAGS_BoardsProduct=true
|
||||
|
||||
# Playbooks
|
||||
BUILD_PLAYBOOKS ?= true
|
||||
BUILD_HASH_PLAYBOOKS = $(BUILD_HASH)
|
||||
|
||||
# We need current user's UID for `run-haserver` so docker compose does not run server
|
||||
# as root and mess up file permissions for devs. When running like this HOME will be blank
|
||||
# and docker will add '/', so we need to set the go-build cache location or we'll get
|
||||
@@ -116,9 +110,6 @@ LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUIL
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)"
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashBoards=$(BUILD_HASH_BOARDS)"
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildBoards=$(BUILD_BOARDS)"
|
||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashPlaybooks=$(BUILD_HASH_PLAYBOOKS)"
|
||||
|
||||
GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
|
||||
GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
|
||||
|
||||
@@ -223,9 +223,6 @@ func GenerateLimitedClientConfig(c *model.Config, telemetryID string, license *m
|
||||
props["BuildHash"] = model.BuildHash
|
||||
props["BuildHashEnterprise"] = model.BuildHashEnterprise
|
||||
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)
|
||||
|
||||
@@ -341,7 +341,7 @@ func (pp *playbooksProduct) Start() error {
|
||||
logrus.Info("Rudder credentials are set. Enabling analytics.")
|
||||
diagnosticID := pp.serviceAdapter.GetDiagnosticID()
|
||||
serverVersion := pp.serviceAdapter.GetServerVersion()
|
||||
pp.telemetryClient, err = telemetry.NewRudder(rudderDataplaneURL, rudderWriteKey, diagnosticID, model.BuildHashPlaybooks, serverVersion)
|
||||
pp.telemetryClient, err = telemetry.NewRudder(rudderDataplaneURL, rudderWriteKey, diagnosticID, model.BuildHash, serverVersion)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed init telemetry client")
|
||||
}
|
||||
@@ -569,7 +569,7 @@ func (pp *playbooksProduct) Stop() error {
|
||||
func newMetricsInstance() *metrics.Metrics {
|
||||
// Init metrics
|
||||
instanceInfo := metrics.InstanceInfo{
|
||||
Version: model.BuildHashPlaybooks,
|
||||
Version: model.BuildHash,
|
||||
InstallationID: os.Getenv("MM_CLOUD_INSTALLATION_ID"),
|
||||
}
|
||||
return metrics.NewMetrics(instanceInfo)
|
||||
|
||||
Ссылка в новой задаче
Block a user