Fix empty GOPATH behaviour in Makefile (#8724)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
09c6770885
Коммит
6c3d1fc1f8
10
Makefile
10
Makefile
@@ -43,7 +43,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Golang Flags
|
# Golang Flags
|
||||||
GOPATH ?= $(GOPATH:):./vendor
|
GOPATH ?= $(shell go env GOPATH)
|
||||||
GOFLAGS ?= $(GOFLAGS:)
|
GOFLAGS ?= $(GOFLAGS:)
|
||||||
GO=go
|
GO=go
|
||||||
GO_LINKER_FLAGS ?= -ldflags \
|
GO_LINKER_FLAGS ?= -ldflags \
|
||||||
@@ -198,9 +198,9 @@ stop-docker: ## Stops the docker containers for local development.
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
@if [ $(shell docker ps -a | grep -ci mattermost-minio) -eq 1 ]; then \
|
@if [ $(shell docker ps -a | grep -ci mattermost-minio) -eq 1 ]; then \
|
||||||
echo stopping mattermost-minio; \
|
echo stopping mattermost-minio; \
|
||||||
docker stop mattermost-minio > /dev/null; \
|
docker stop mattermost-minio > /dev/null; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \
|
@if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \
|
||||||
echo stopping mattermost-elasticsearch; \
|
echo stopping mattermost-elasticsearch; \
|
||||||
@@ -273,7 +273,7 @@ gofmt: ## Runs gofmt against all packages.
|
|||||||
|
|
||||||
store-mocks: ## Creates mock files.
|
store-mocks: ## Creates mock files.
|
||||||
go get github.com/vektra/mockery/...
|
go get github.com/vektra/mockery/...
|
||||||
GOPATH=$(shell go env GOPATH) $(shell go env GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.'
|
$(GOPATH)/bin/mockery -dir store -all -output store/storetest/mocks -note 'Regenerate this file using `make store-mocks`.'
|
||||||
|
|
||||||
update-jira-plugin: ## Updates Jira plugin.
|
update-jira-plugin: ## Updates Jira plugin.
|
||||||
go get github.com/mattermost/go-bindata/...
|
go get github.com/mattermost/go-bindata/...
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user