Skip to content

Commit

Permalink
Remove compat from go mod tidy (#213)
Browse files Browse the repository at this point in the history
* Makefile: extract Go version from go.mod

Signed-off-by: Florian Lehner <[email protected]>

* fixup: drop GO_VERSION

With the removal of -compat in go-mod-tidy GO_VERSION is no longer used.

Signed-off-by: Florian Lehner <[email protected]>

---------

Signed-off-by: Florian Lehner <[email protected]>
Co-authored-by: Robert Pająk <[email protected]>
  • Loading branch information
florianl and pellared authored Nov 28, 2024
1 parent 4073945 commit e4eca26
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ $(error Submodule at $(OTEL_PROTO_SUBMODULE) is not checked out, use "git submod
endif

GO := go
GO_VERSION := 1.17
GO_MOD_ROOT := go.opentelemetry.io/proto
ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS))
Expand Down Expand Up @@ -165,7 +164,7 @@ go-mod-tidy/%: DIR=$*
go-mod-tidy/%:
@echo "$(GO) mod tidy in $(DIR)" \
&& cd $(DIR) \
&& $(GO) mod tidy -compat=1.21
&& $(GO) mod tidy

test: $(OTEL_GO_MOD_DIRS:%=test/%)
test/%: DIR=$*
Expand Down

0 comments on commit e4eca26

Please sign in to comment.