diff --git a/Makefile b/Makefile index 81dc70bfde..8279952208 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ ensure-pinniped-repo: ## Clone Pinniped .PHONY: prep-build-cli prep-build-cli: ensure-pinniped-repo ## Prepare for building the CLI $(GO) mod download - $(GO) mod tidy -compat=${GOVERSION} + $(GO) mod tidy EMBED_PROVIDERS_TAG=embedproviders ifeq "${BUILD_TAGS}" "${EMBED_PROVIDERS_TAG}" make -C pkg/v1/providers -f Makefile generate-provider-bundle-zip @@ -603,7 +603,7 @@ modules: ## Runs go mod to ensure modules are up to date. @for i in $(GO_MODULES); do \ echo "-- Tidying $$i --"; \ pushd $${i}; \ - $(GO) mod tidy -compat=${GOVERSION} || exit 1; \ + $(GO) mod tidy || exit 1; \ popd; \ done @@ -822,7 +822,7 @@ create-package: ## Stub out new package directories and manifests. Usage: make c .PHONY: prep-package-tools prep-package-tools: - cd hack/packages/package-tools && $(GO) mod tidy -compat=${GOVERSION} + cd hack/packages/package-tools && $(GO) mod tidy .PHONY: package-bundle package-bundle: tools prep-package-tools ## Build one specific tar bundle package, needs PACKAGE_NAME VERSION diff --git a/common.mk b/common.mk index e6d8c111a9..418d09c426 100644 --- a/common.mk +++ b/common.mk @@ -5,7 +5,6 @@ GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) GOHOSTOS ?= $(shell go env GOHOSTOS) GOHOSTARCH ?= $(shell go env GOHOSTARCH) -GOVERSION ?= 1.18 ROOT_DIR := $(shell git rev-parse --show-toplevel) RELATIVE_ROOT ?= .