Merge pull request #243 from orelmisan/rm-go-mod-compat

Makefile, vendor: Remove compat flag
kiagnose · Aug 20, 2024 · 60fa1ee · 60fa1ee
2 parents fba9007 + 3173c06
commit 60fa1ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,6 @@ BIN_DIR = $(CURDIR)/_output/bin
 CRI_BIN ?= $(shell hack/detect_cri.sh)
 LINTER_IMAGE_NAME := docker.io/golangci/golangci-lint
 LINTER_IMAGE_TAG := v1.60.1
-GO_MOD_VERSION=$(shell hack/go-mod-version.sh)
 KUBECONFIG ?= $(HOME)/.kube/config
 
 E2E_TEST_TIMEOUT ?= 1h
@@ -91,7 +90,7 @@ vendor:
 	$(CRI_BIN) run --rm \
 	           --volume $(CURDIR):$(CURDIR):Z \
 	           --workdir $(CURDIR) \
-	           $(GO_IMAGE_NAME):$(GO_IMAGE_TAG) go mod tidy -compat=$(GO_MOD_VERSION) && go mod vendor
+	           $(GO_IMAGE_NAME):$(GO_IMAGE_TAG) go mod tidy && go mod vendor
 .PHONY: vendor
 
 build-vm-image-builder:

diff --git a/hack/go-mod-version.sh b/hack/go-mod-version.sh