diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-05-02 18:03:59 +0200 |
|---|---|---|
| committer | openshift-cherrypick-robot <> | 2022-05-03 13:50:35 +0000 |
| commit | cb399245b52f750cf7a846a6e5f3c535d9027eaa (patch) | |
| tree | e9d8831ecf1991b5647fb512012e1aba046fa16e | |
| parent | 21d416765f99a7e1264580810f9beac4157e6fe7 (diff) | |
| download | podman-cb399245b52f750cf7a846a6e5f3c535d9027eaa.tar.gz podman-cb399245b52f750cf7a846a6e5f3c535d9027eaa.tar.bz2 podman-cb399245b52f750cf7a846a6e5f3c535d9027eaa.zip | |
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>
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -174,9 +174,8 @@ endif # Necessary for nested-$(MAKE) calls and docs/remote-docs.sh export GOOS GOARCH CGO_ENABLED BINSFX SRCBINDIR -define go-get - env GO111MODULE=off \ - $(GO) get -u ${1} +define go-install + $(GO) install ${1}@latest endef # 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 if [ ! -x "$(GOBIN)/goimports" ]; then \ - $(call go-get,golang.org/x/tools/cmd/goimports); \ + $(call go-install,golang.org/x/tools/cmd/goimports); \ fi touch .install.goimports @@ -878,7 +877,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal .PHONY: .install.gitvalidation .install.gitvalidation: .gopathok if [ ! -x "$(GOBIN)/git-validation" ]; then \ - $(call go-get,github.com/vbatts/git-validation); \ + $(call go-install,github.com/vbatts/git-validation); \ fi .PHONY: .install.golangci-lint @@ -898,7 +897,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal .PHONY: .install.md2man .install.md2man: .gopathok if [ ! -x "$(GOMD2MAN)" ]; then \ - $(call go-get,github.com/cpuguy83/go-md2man); \ + $(call go-install,github.com/cpuguy83/go-md2man); \ fi # $BUILD_TAGS variable is used in hack/golangci-lint.sh |