From a69bed712d53e9a7984915fffffc8a2fd1647a7a Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 7 Sep 2017 14:58:12 -0700 Subject: Fixing makefile goflags (#7408) --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1d51653df..b5ae7a55f 100644 --- a/Makefile +++ b/Makefile @@ -45,11 +45,11 @@ GOPATH ?= $(GOPATH:):./vendor GOFLAGS ?= $(GOFLAGS:) GO=go GO_LINKER_FLAGS ?= -ldflags \ - "-X github.com/mattermost/platform/model.BuildNumber=$(BUILD_NUMBER)\ - -X 'github.com/mattermost/platform/model.BuildDate=$(BUILD_DATE)'\ - -X github.com/mattermost/platform/model.BuildHash=$(BUILD_HASH)\ - -X github.com/mattermost/platform/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ - -X github.com/mattermost/platform/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" + "-X github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)\ + -X 'github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)'\ + -X github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost-server/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost-server/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" # GOOS/GOARCH of the build host, used to determine whether we're cross-compiling or not BUILDER_GOOS_GOARCH="$(shell $(GO) env GOOS)_$(shell $(GO) env GOARCH)" @@ -328,7 +328,7 @@ test-postgres: @sed -i'' -e 's|"DriverName": "mysql"|"DriverName": "postgres"|g' config/config.json @sed -i'' -e 's|"DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"|"DataSource": "postgres://mmuser:mostest@dockerhost:5432?sslmode=disable"|g' config/config.json - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=2000s -covermode=count -coverprofile=cprofile.out -coverpkg=$(ALL_PACKAGES_COMMA) github.com/mattermost/platform/store || exit 1; \ + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=2000s -covermode=count -coverprofile=cprofile.out -coverpkg=$(ALL_PACKAGES_COMMA) github.com/mattermost/mattermost-server/store || exit 1; \ if [ -f cprofile.out ]; then \ tail -n +2 cprofile.out >> cover.out; \ rm cprofile.out; \ -- cgit v1.2.3-1-g7c22