From 1011a9a85e54c172a613f80cae68a253fc84535b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 19 Sep 2022 11:09:11 -0600 Subject: [PATCH] [v3.4] fix build install.tools target broke a few weeks ago because it was fetching something @latest. We can't use 'go install' nor 'got get ...@version' on this branch, so just delete the .gitvalidation steps entirely. Signed-off-by: Ed Santiago --- Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 2b2cbcad33..36fa83041c 100644 --- a/Makefile +++ b/Makefile @@ -221,11 +221,6 @@ ifeq ("$(wildcard $(GOPKGDIR))","") endif touch $@ -.PHONY: .gitvalidation -.gitvalidation: .gopathok - @echo "Validating vs commit '$(call err_if_empty,EPOCH_TEST_COMMIT)'" - GIT_CHECK_EXCLUDE="./vendor:docs/make.bat:test/buildah-bud/buildah-tests.diff" $(GOBIN)/git-validation -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD) - .PHONY: lint lint: golangci-lint @echo "Linting vs commit '$(call err_if_empty,EPOCH_TEST_COMMIT)'" @@ -271,7 +266,7 @@ codespell: codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w .PHONY: validate -validate: gofmt lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit +validate: gofmt lint validate.completions man-page-check swagger-check tests-included tests-expect-exit .PHONY: build-all-new-commits build-all-new-commits: @@ -760,7 +755,7 @@ install.systemd: endif .PHONY: install.tools -install.tools: .install.goimports .install.gitvalidation .install.md2man .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools +install.tools: .install.goimports .install.md2man .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools .install.goimports: .gopathok if [ ! -x "$(GOBIN)/goimports" ]; then \ @@ -774,12 +769,6 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ fi -.PHONY: .install.gitvalidation -.install.gitvalidation: .gopathok - if [ ! -x "$(GOBIN)/git-validation" ]; then \ - $(call go-get,github.com/vbatts/git-validation); \ - fi - .PHONY: .install.golangci-lint .install.golangci-lint: .gopathok VERSION=1.36.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh