Fix the LDFLAGS references to use the version suffix (#13242)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
eeec08c071
Коммит
070ec77ee3
30
Makefile
30
Makefile
@@ -50,11 +50,11 @@ GOPATH ?= $(shell go env GOPATH)
|
|||||||
GOFLAGS ?= $(GOFLAGS:) -mod=vendor
|
GOFLAGS ?= $(GOFLAGS:) -mod=vendor
|
||||||
GO=go
|
GO=go
|
||||||
DELVE=dlv
|
DELVE=dlv
|
||||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)"
|
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)"
|
||||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)"
|
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)"
|
||||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)"
|
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)"
|
||||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
|
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
|
||||||
LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
|
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
|
||||||
GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
|
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)
|
GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
|
||||||
MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1
|
MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1
|
||||||
@@ -315,20 +315,20 @@ run-server: validate-go-version start-docker ## Starts the server.
|
|||||||
debug-server: start-docker ## Compile and start server using delve.
|
debug-server: start-docker ## Compile and start server using delve.
|
||||||
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
|
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
|
||||||
$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
|
$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\
|
||||||
-X \"github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)\"\
|
-X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
|
-X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
|
||||||
|
|
||||||
debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
|
debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
|
||||||
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
|
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
|
||||||
$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
|
$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\
|
||||||
-X \"github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)\"\
|
-X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
|
-X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
|
||||||
-X github.com/mattermost/mattermost-server/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
|
-X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
|
||||||
|
|
||||||
run-cli: start-docker ## Runs CLI.
|
run-cli: start-docker ## Runs CLI.
|
||||||
@echo Running mattermost for development
|
@echo Running mattermost for development
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user