diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
| commit | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch) | |
| tree | 1c634c90166964f5184cb1ebd20ffb8ed209b120 /Makefile | |
| parent | 60cf74352f13874a7d07c609c03b1c763af19cea (diff) | |
| parent | c1853c7f40dd67c49524c8ea884ab61883a6abdd (diff) | |
| download | chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2 chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -43,7 +43,7 @@ else endif # Golang Flags -GOPATH ?= $(GOPATH:):./vendor +GOPATH ?= $(shell go env GOPATH) GOFLAGS ?= $(GOFLAGS:) GO=go GO_LINKER_FLAGS ?= -ldflags \ @@ -198,9 +198,9 @@ stop-docker: ## Stops the docker containers for local development. fi @if [ $(shell docker ps -a | grep -ci mattermost-minio) -eq 1 ]; then \ - echo stopping mattermost-minio; \ - docker stop mattermost-minio > /dev/null; \ - fi + echo stopping mattermost-minio; \ + docker stop mattermost-minio > /dev/null; \ + fi @if [ $(shell docker ps -a | grep -ci mattermost-elasticsearch) -eq 1 ]; then \ echo stopping mattermost-elasticsearch; \ @@ -273,7 +273,7 @@ gofmt: ## Runs gofmt against all packages. store-mocks: ## Creates mock files. 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. go get github.com/mattermost/go-bindata/... |