Skip to content

Commit a3682cf

Browse files
authored
update tools build tag due to 3rd party conflict (#1793)
Signed-off-by: Evan Baker <[email protected]>
1 parent df43143 commit a3682cf

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -757,44 +757,46 @@ setup: tools install-hooks gitconfig ## performs common required repo setup
757757

758758
##@ Tools
759759

760+
TOOL_TAG = azure-container-netwokring/build/tools
761+
760762
$(TOOLS_DIR)/go.mod:
761763
cd $(TOOLS_DIR); go mod init && go mod tidy
762764

763765
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod
764-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
766+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
765767

766768
controller-gen: $(CONTROLLER_GEN) ## Build controller-gen
767769

768770
protoc:
769771
source ${REPO_ROOT}/scripts/install-protoc.sh
770772

771773
$(GOCOV): $(TOOLS_DIR)/go.mod
772-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/gocov github.com/axw/gocov/gocov
774+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gocov github.com/axw/gocov/gocov
773775

774776
gocov: $(GOCOV) ## Build gocov
775777

776778
$(GOCOV_XML): $(TOOLS_DIR)/go.mod
777-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/gocov-xml github.com/AlekSi/gocov-xml
779+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gocov-xml github.com/AlekSi/gocov-xml
778780

779781
gocov-xml: $(GOCOV_XML) ## Build gocov-xml
780782

781783
$(GOFUMPT): $(TOOLS_DIR)/go.mod
782-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/gofumpt mvdan.cc/gofumpt
784+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gofumpt mvdan.cc/gofumpt
783785

784786
gofumpt: $(GOFUMPT) ## Build gofumpt
785787

786788
$(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod
787-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
789+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
788790

789791
golangci-lint: $(GOLANGCI_LINT) ## Build golangci-lint
790792

791793
$(GO_JUNIT_REPORT): $(TOOLS_DIR)/go.mod
792-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/go-junit-report github.com/jstemmer/go-junit-report
794+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/go-junit-report github.com/jstemmer/go-junit-report
793795

794796
go-junit-report: $(GO_JUNIT_REPORT) ## Build go-junit-report
795797

796798
$(MOCKGEN): $(TOOLS_DIR)/go.mod
797-
cd $(TOOLS_DIR); go mod download; go build -tags=tools -o bin/mockgen github.com/golang/mock/mockgen
799+
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/mockgen github.com/golang/mock/mockgen
798800

799801
mockgen: $(MOCKGEN) ## Build mockgen
800802

build/tools/tools.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build tools
2-
// +build tools
1+
//go:build azure-container-netwokring/build/tools
2+
// +build azure-container-netwokring/build/tools
33

44
package tools
55

0 commit comments

Comments
 (0)