Skip to content

Commit e4eca26

Browse files
florianlpellared
andauthored
Remove compat from go mod tidy (#213)
* 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]>
1 parent 4073945 commit e4eca26

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ $(error Submodule at $(OTEL_PROTO_SUBMODULE) is not checked out, use "git submod
3737
endif
3838

3939
GO := go
40-
GO_VERSION := 1.17
4140
GO_MOD_ROOT := go.opentelemetry.io/proto
4241
ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
4342
OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS))
@@ -165,7 +164,7 @@ go-mod-tidy/%: DIR=$*
165164
go-mod-tidy/%:
166165
@echo "$(GO) mod tidy in $(DIR)" \
167166
&& cd $(DIR) \
168-
&& $(GO) mod tidy -compat=1.21
167+
&& $(GO) mod tidy
169168

170169
test: $(OTEL_GO_MOD_DIRS:%=test/%)
171170
test/%: DIR=$*

0 commit comments

Comments
 (0)