Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(TOOLS):

$(TOOLS)/%: $(TOOLS_DIR)/go.mod | $(TOOLS)
cd $(TOOLS_DIR) && \
go build -o $@ $(PACKAGE)
GOWORK=off go build -o $@ $(PACKAGE)

CROSSLINK = $(TOOLS)/crosslink
$(CROSSLINK): PACKAGE=go.opentelemetry.io/build-tools/crosslink
Expand Down Expand Up @@ -512,6 +512,10 @@ go-work: $(CROSSLINK) ## Generate go.work file for local development
@$(CROSSLINK) work --root=$(CURDIR) --go=$(GO_VERSION)
@# Fix go version to include patch version (crosslink only supports major.minor)
@sed -i.bak 's/^go $(GO_VERSION)$$/go $(GO_VERSION).0/' go.work && rm -f go.work.bak
@# Drop tool-only modules: their transitive deps conflict with the main modules
@# (e.g. old monolithic genproto vs. split genproto/googleapis/rpc).
@go work edit -dropuse ./.tools
Comment thread
kakkoyun marked this conversation as resolved.
@go work edit -dropuse ./.github/tools
@echo "go.work file generated successfully"

.PHONY: go-mod-tidy
Expand Down
Loading