containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: emergency fix for broken go get 

go get is deprecated, we should use go install instead.

Also for some reason go get -u golang.org/x/tools/cmd/goimports is
broken at the moment, thus failing CI jobs where we have to install
this. Switching to go install seems to fix it.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2022-05-02 18:03:59 +02:00
parent adf6ee671f
commit e17b56e0cf
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -174,9 +174,8 @@ endif
# Necessary for nested-$(MAKE) calls and docs/remote-docs.sh # Necessary for nested-$(MAKE) calls and docs/remote-docs.sh
export GOOS GOARCH CGO_ENABLED BINSFX SRCBINDIR export GOOS GOARCH CGO_ENABLED BINSFX SRCBINDIR
define go-get define go-install
env GO111MODULE=off \ $(GO) install ${1}@latest
$(GO) get -u ${1}
endef endef
# Need to use CGO for mDNS resolution, but cross builds need CGO disabled # Need to use CGO for mDNS resolution, but cross builds need CGO disabled
@ -865,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal
.install.goimports: .gopathok .install.goimports: .gopathok
if [ ! -x "$(GOBIN)/goimports" ]; then \ if [ ! -x "$(GOBIN)/goimports" ]; then \
$(call go-get,golang.org/x/tools/cmd/goimports); \ $(call go-install,golang.org/x/tools/cmd/goimports); \
fi fi
touch .install.goimports touch .install.goimports
@ -878,7 +877,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal
.PHONY: .install.gitvalidation .PHONY: .install.gitvalidation
.install.gitvalidation: .gopathok .install.gitvalidation: .gopathok
if [ ! -x "$(GOBIN)/git-validation" ]; then \ if [ ! -x "$(GOBIN)/git-validation" ]; then \
$(call go-get,github.com/vbatts/git-validation); \ $(call go-install,github.com/vbatts/git-validation); \
fi fi
.PHONY: .install.golangci-lint .PHONY: .install.golangci-lint
@ -898,7 +897,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal
.PHONY: .install.md2man .PHONY: .install.md2man
.install.md2man: .gopathok .install.md2man: .gopathok
if [ ! -x "$(GOMD2MAN)" ]; then \ if [ ! -x "$(GOMD2MAN)" ]; then \
$(call go-get,github.com/cpuguy83/go-md2man); \ $(call go-install,github.com/cpuguy83/go-md2man); \
fi fi
# $BUILD_TAGS variable is used in hack/golangci-lint.sh # $BUILD_TAGS variable is used in hack/golangci-lint.sh