Skip to content

Commit

Permalink
Add GO param to Makefile (jaegertracing#4337)
Browse files Browse the repository at this point in the history
`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
yurishkuro authored Mar 25, 2023
1 parent 45d2de2 commit 17f34b7
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Makefile
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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 17f34b7

Please sign in to comment.