Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Commit

Permalink
Remove use of -compat flag for go mod (#3570)
Browse files Browse the repository at this point in the history
Fixes #3569

Now that we use go.18 for all our modules, the -compat flag is no
longer useful.

Signed-off-by: Marc Khouzam <[email protected]>
  • Loading branch information
marckhouzam authored Oct 12, 2022
1 parent 83f9375 commit 59b5a1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= .
Expand Down

0 comments on commit 59b5a1d

Please sign in to comment.