forked from jaegertracing/jaeger
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add GO param to Makefile (jaegertracing#4337)
`go` command was hardcoded, making it difficult to run with `gotip`. Now can do `make test GO=gotip` Signed-off-by: Yuri Shkuro <[email protected]>
- Loading branch information
1 parent
45d2de2
commit 17f34b7
Showing
1 changed file
with
8 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
SHELL := /bin/bash | ||
JAEGER_IMPORT_PATH = github.com/jaegertracing/jaeger | ||
STORAGE_PKGS = ./plugin/storage/integration/... | ||
GO = go | ||
|
||
include docker/Makefile | ||
|
||
|
@@ -31,11 +32,11 @@ ifeq ($(UNAME), s390x) | |
else | ||
RACE=-race | ||
endif | ||
GOOS ?= $(shell go env GOOS) | ||
GOARCH ?= $(shell go env GOARCH) | ||
GOOS ?= $(shell $(GO) env GOOS) | ||
GOARCH ?= $(shell $(GO) env GOARCH) | ||
GOCACHE=$(abspath .gocache) | ||
GOBUILD=GOCACHE=$(GOCACHE) CGO_ENABLED=0 installsuffix=cgo go build -trimpath | ||
GOTEST=GOCACHE=$(GOCACHE) go test -v $(RACE) | ||
GOBUILD=GOCACHE=$(GOCACHE) CGO_ENABLED=0 installsuffix=cgo $(GO) build -trimpath | ||
GOTEST=GOCACHE=$(GOCACHE) $(GO) test -v $(RACE) | ||
GOFMT=gofmt | ||
GOFUMPT=gofumpt | ||
FMT_LOG=.fmt.log | ||
|
@@ -392,9 +393,9 @@ draft-release: | |
|
||
.PHONY: install-tools | ||
install-tools: | ||
go install github.com/vektra/mockery/[email protected] | ||
go install github.com/golangci/golangci-lint/cmd/[email protected] | ||
go install mvdan.cc/gofumpt@latest | ||
$(GO) install github.com/vektra/mockery/[email protected] | ||
$(GO) install github.com/golangci/golangci-lint/cmd/[email protected] | ||
$(GO) install mvdan.cc/gofumpt@latest | ||
|
||
.PHONY: install-ci | ||
install-ci: install-tools | ||
|