opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 20:54:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[v3.4] fix build

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2022-09-19 11:09:11 -06:00
parent 0648084570
commit 1011a9a85e
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -221,11 +221,6 @@ ifeq ("$(wildcard $(GOPKGDIR))","")
endif endif
touch $@ 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 .PHONY: lint
lint: golangci-lint lint: golangci-lint
@echo "Linting vs commit '$(call err_if_empty,EPOCH_TEST_COMMIT)'" @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 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 .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 .PHONY: build-all-new-commits
build-all-new-commits: build-all-new-commits:
@ -760,7 +755,7 @@ install.systemd:
endif endif
.PHONY: install.tools .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 .install.goimports: .gopathok
if [ ! -x "$(GOBIN)/goimports" ]; then \ 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 ; \ $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \
fi 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 .PHONY: .install.golangci-lint
.install.golangci-lint: .gopathok .install.golangci-lint: .gopathok
VERSION=1.36.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh VERSION=1.36.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh